]> arthur.barton.de Git - netatalk.git/commitdiff
projects / netatalk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 65b394e fc7cdce)
Merge branch 'develop' of netafp.com:git/netatalk into develop
authorFrank Lahm <franklahm@googlemail.com>
Sat, 2 Jun 2012 14:53:59 +0000 (16:53 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Sat, 2 Jun 2012 14:53:59 +0000 (16:53 +0200)

Trivial merge
Alex' Netatalk development repository