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

Merge remote branch 'sf/develop'
---

d63169492666ad4482b83bdbaf0d8797ff2ac549