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