]> arthur.barton.de Git - netatalk.git/commitdiff
projects / netatalk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0573a52 64d5343)
Merge branch 'branch-netatalk-2-1' of ssh://netatalk.git.sourceforge.net/gitroot...
authorFrank Lahm <franklahm@googlemail.com>
Mon, 6 Jun 2011 14:07:08 +0000 (16:07 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Mon, 6 Jun 2011 14:07:08 +0000 (16:07 +0200)

Trivial merge
Alex' Netatalk development repository