]> arthur.barton.de Git - netatalk.git/commitdiff
projects / netatalk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 77f2fc6 52e4a0b)
Merge branch 'master', remote branch 'sf/master'
authorFrank Lahm <franklahm@googlemail.com>
Tue, 26 Jul 2011 11:58:23 +0000 (13:58 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Tue, 26 Jul 2011 11:58:23 +0000 (13:58 +0200)

Trivial merge
Alex' Netatalk development repository