]> arthur.barton.de Git - netatalk.git/commitdiff
projects / netatalk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 785e6a0 5fd98f4)
Merge remote branch 'sf/master'
authorFrank Lahm <franklahm@googlemail.com>
Wed, 30 Nov 2011 10:59:57 +0000 (11:59 +0100)
committerFrank Lahm <franklahm@googlemail.com>
Wed, 30 Nov 2011 10:59:57 +0000 (11:59 +0100)

Trivial merge
Alex' Netatalk development repository