]> arthur.barton.de Git - netatalk.git/commitdiff
merge from branch 2-1
authorFrank Lahm <franklahm@googlemail.com>
Tue, 14 Sep 2010 15:41:06 +0000 (17:41 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Tue, 14 Sep 2010 15:41:06 +0000 (17:41 +0200)

Trivial merge