]> arthur.barton.de Git - netatalk.git/commitdiff
projects / netatalk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2e3b9f7 999f7a4)
Merge branch 'branch-allea' of netafp.com:git/netatalk into branch-allea
authorFrank Lahm <franklahm@googlemail.com>
Wed, 4 Jan 2012 10:06:55 +0000 (11:06 +0100)
committerFrank Lahm <franklahm@googlemail.com>
Wed, 4 Jan 2012 10:06:55 +0000 (11:06 +0100)

Trivial merge
Alex' Netatalk development repository