]> arthur.barton.de Git - netatalk.git/commitdiff
projects / netatalk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dcbfd39 32375bb)
Merge from branch 2-1
authorFrank Lahm <franklahm@googlemail.com>
Wed, 15 Sep 2010 08:50:41 +0000 (10:50 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Wed, 15 Sep 2010 08:50:41 +0000 (10:50 +0200)

Trivial merge
Alex' Netatalk development repository