]> arthur.barton.de Git - netatalk.git/commitdiff
projects / netatalk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 247d71c 409fa01)
Merge remote branch 'sf/master'
authorFrank Lahm <franklahm@googlemail.com>
Mon, 1 Aug 2011 12:53:17 +0000 (14:53 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Mon, 1 Aug 2011 12:53:17 +0000 (14:53 +0200)

Trivial merge
Alex' Netatalk development repository