]> arthur.barton.de Git - netatalk.git/commitdiff
projects / netatalk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 2cdba40 e684ac5)
Merge remote branch 'sf/master'
authorFrank Lahm <franklahm@googlemail.com>
Mon, 15 Aug 2011 11:52:41 +0000 (13:52 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Mon, 15 Aug 2011 11:52:41 +0000 (13:52 +0200)

Trivial merge
Alex' Netatalk development repository