]> arthur.barton.de Git - netatalk.git/commitdiff
projects / netatalk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1307ea3 4d1389b)
Merge branch 'release-3-0-alpha2' into develop
authorFrank Lahm <franklahm@googlemail.com>
Wed, 4 Apr 2012 10:24:03 +0000 (12:24 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Wed, 4 Apr 2012 10:24:03 +0000 (12:24 +0200)

Trivial merge
Alex' Netatalk development repository