]> arthur.barton.de Git - netatalk.git/commitdiff
projects / netatalk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 120dbba 8dc0281)
Merge remote branch 'remotes/origin/branch-netatalk-2-1'
authorFrank Lahm <franklahm@googlemail.com>
Mon, 17 May 2010 10:25:06 +0000 (12:25 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Mon, 17 May 2010 10:25:06 +0000 (12:25 +0200)

Trivial merge
Alex' Netatalk development repository