From: Frank Lahm <franklahm@googlemail.com>
Date: Fri, 28 Sep 2012 09:24:07 +0000 (+0200)
Subject: Merge remote branch 'sf/develop' into develop
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=ff3c638bca299186b0ea315ddd0596b2826dc21a

Merge remote branch 'sf/develop' into develop
---

ff3c638bca299186b0ea315ddd0596b2826dc21a