Merge remote-tracking branch 'origin/branch-netatalk-3-1'
authorRalph Boehme <rb@sernet.de>
Fri, 1 Aug 2014 14:19:01 +0000 (16:19 +0200)
committerRalph Boehme <rb@sernet.de>
Fri, 1 Aug 2014 14:19:01 +0000 (16:19 +0200)

Trivial merge