From: Frank Lahm <franklahm@googlemail.com>
Date: Thu, 14 Jun 2012 13:44:07 +0000 (+0200)
Subject: Merge remote branch 'sf/develop' into develop
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93414a20654cde933490ab20da953a13c3ba3181;hp=93414a20654cde933490ab20da953a13c3ba3181;p=netatalk.git

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