From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 1 Jan 2017 01:24:17 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v0.6.0~21
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=ebd2325d0042ad5bf2147f2e993d80f2bbb3acc9;hp=-c

Merge branch 'maint'

* maint:
  Update copyright year to 2017.
---

ebd2325d0042ad5bf2147f2e993d80f2bbb3acc9