Merge branch 'maint'
authorAndre Noll <maan@tuebingen.mpg.de>
Sun, 1 Jan 2017 01:24:17 +0000 (02:24 +0100)
committerAndre Noll <maan@tuebingen.mpg.de>
Sun, 1 Jan 2017 01:24:17 +0000 (02:24 +0100)
commitebd2325d0042ad5bf2147f2e993d80f2bbb3acc9
tree273f40c1c1b3db312000ff3cef8bd57206fb7e64
parent9a1fa5709f35a8a5ec49c4bad82810fc11ae0811
parent7eaf2faf618705c97c77750371e177108aaa5897
Merge branch 'maint'

* maint:
  Update copyright year to 2017.