]> arthur.barton.de Git - netatalk.git/commitdiff
Merge remote branch 'sf/branch-allea' into branch-allea
authorFrank Lahm <franklahm@googlemail.com>
Mon, 26 Mar 2012 09:06:38 +0000 (11:06 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Mon, 26 Mar 2012 09:06:38 +0000 (11:06 +0200)

Trivial merge