]> arthur.barton.de Git - netatalk.git/commitdiff
projects / netatalk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 700dd7a 22ccb29)
Merge branch 'ldap'
authorFrank Lahm <franklahm@googlemail.com>
Mon, 5 Mar 2012 15:36:06 +0000 (16:36 +0100)
committerFrank Lahm <franklahm@googlemail.com>
Mon, 5 Mar 2012 15:36:06 +0000 (16:36 +0100)

Trivial merge
Alex' Netatalk development repository