]> arthur.barton.de Git - netatalk.git/commitdiff
projects / netatalk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a9ba8fb 6c6dab7)
Merge branch 'develop' of netafp.com:git/netatalk into develop
authorFrank Lahm <franklahm@googlemail.com>
Wed, 30 May 2012 17:57:07 +0000 (19:57 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Wed, 30 May 2012 17:57:07 +0000 (19:57 +0200)

Trivial merge
Alex' Netatalk development repository