]> arthur.barton.de Git - netatalk.git/commit - libatalk/acl/ldap_config.c
Merge branch-2-1
authorFrank Lahm <franklahm@googlemail.com>
Sun, 26 Sep 2010 11:05:30 +0000 (13:05 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Sun, 26 Sep 2010 11:05:30 +0000 (13:05 +0200)
commit604970a27806297452761db2383b60f644cede0a
tree5eb3e0f7c4349254437920f5a2e190a4d1bb9696
parent8cfcbaea66c691c147a334b39e9f8b4561f34343
parent330e7ef3a06863aacec3de10ea503b859822eba4
Merge branch-2-1