From: Frank Lahm <franklahm@googlemail.com>
Date: Mon, 15 Aug 2011 11:52:41 +0000 (+0200)
Subject: Merge remote branch 'sf/master'
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=d0c35943f083947fe9faea917cd5f4e9d07f155a

Merge remote branch 'sf/master'
---

d0c35943f083947fe9faea917cd5f4e9d07f155a