]> arthur.barton.de Git - netatalk.git/commitdiff
projects / netatalk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0eb668a 62253a7)
Merge from branch-2-1
authorFrank Lahm <franklahm@googlemail.com>
Fri, 18 Jun 2010 14:18:43 +0000 (16:18 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Fri, 18 Jun 2010 14:18:43 +0000 (16:18 +0200)

Trivial merge
Alex' Netatalk development repository