]> arthur.barton.de Git - netatalk.git/commit - include/atalk/acl.h
Merge from branch-2-1
authorFrank Lahm <franklahm@googlemail.com>
Tue, 14 Sep 2010 14:13:06 +0000 (16:13 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Tue, 14 Sep 2010 14:13:06 +0000 (16:13 +0200)
commitba288e1499eb7106d6372ec019256b7d3ea1d2e7
tree411eeb0ec3c757a7266f77bae396a0454572819e
parentb3bcbf9805a3b6538ec71f41a9f537e03e81adcd
parent5b864913719ae86c6b8c6e7dbac65403fe1bc364
Merge from branch-2-1
etc/afpd/main.c