]> arthur.barton.de Git - netatalk.git/commitdiff
projects / netatalk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 45d040c e0dc1e3)
Merge remote branch 'remotes/origin/branch-netatalk-2-1'
authorFrank Lahm <franklahm@googlemail.com>
Mon, 17 May 2010 13:56:26 +0000 (15:56 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Mon, 17 May 2010 13:56:26 +0000 (15:56 +0200)

Trivial merge
Alex' Netatalk development repository