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

Merge branch 'develop'
---

0631f0163929589284026381cd5efa51d9938bca