Merge branch 'acl'
authorJeremy Harris <jgh146exb@wizmail.org>
Sun, 1 Jul 2012 15:01:29 +0000 (16:01 +0100)
committerJeremy Harris <jgh146exb@wizmail.org>
Sun, 1 Jul 2012 15:01:29 +0000 (16:01 +0100)
commit3e8abda0fa92b78c4a3dfbad940b12fc90c241e3
tree856bfe57a0869370207b86139455ce3a8eb51303
parentad0192a86e59a2c3cef2945d68dc22e52258d085
parentbef3ea7f5de507f4eda7f32ac767ec6ac0441d57
Merge branch 'acl'
doc/doc-docbook/spec.xfpt
doc/doc-txt/ChangeLog
doc/doc-txt/NewStuff
src/src/globals.c
src/src/globals.h