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)
commitab6e6f8ed24667ced438afe4df5997469a2ff53b
tree84ba66b6817e000c89d571ad780e1675aab6adca
parent471d63120ea3d21bd9d6eb3b220d1e3eec419f68
parent04ba0da5353433c05d43447a76a7669bae3a09da
Merge remote-tracking branch 'origin/branch-netatalk-3-1'