]> arthur.barton.de Git - netatalk.git/commitdiff
projects / netatalk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d2df1e7 80f3b5f)
Merge remote branch 'sf/develop'
authorFrank Lahm <franklahm@googlemail.com>
Thu, 14 Jun 2012 13:41:41 +0000 (15:41 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Thu, 14 Jun 2012 13:41:41 +0000 (15:41 +0200)

Trivial merge
Alex' Netatalk development repository