]> arthur.barton.de Git - netatalk.git/commitdiff
projects / netatalk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3b630e0 7685846)
Merge branch 'master' of ssh://netatalk.git.sourceforge.net/gitroot/netatalk/netatalk
authorFrank Lahm <franklahm@googlemail.com>
Sat, 18 Jun 2011 10:42:53 +0000 (12:42 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Sat, 18 Jun 2011 10:42:53 +0000 (12:42 +0200)

Trivial merge
Alex' Netatalk development repository