From: Frank Lahm <franklahm@googlemail.com>
Date: Wed, 31 Aug 2011 06:08:59 +0000 (+0200)
Subject: Merge remote branch 'sf/master'
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=4be14d76f00ca8e199067d19765627e5a790a7c0;p=netatalk.git

Merge remote branch 'sf/master'
---

4be14d76f00ca8e199067d19765627e5a790a7c0