Merge remote branch 'sf/branch-allea' into branch-allea
authorFrank Lahm <franklahm@googlemail.com>
Fri, 17 Feb 2012 16:23:43 +0000 (17:23 +0100)
committerFrank Lahm <franklahm@googlemail.com>
Fri, 17 Feb 2012 16:23:43 +0000 (17:23 +0100)
1  2 
etc/afpd/afp_config.c

Simple merge