]> arthur.barton.de Git - netatalk.git/commitdiff
Merge remote branch 'netafp/master' into branch-allea
authorFrank Lahm <franklahm@googlemail.com>
Wed, 7 Mar 2012 13:17:26 +0000 (14:17 +0100)
committerFrank Lahm <franklahm@googlemail.com>
Wed, 7 Mar 2012 13:17:26 +0000 (14:17 +0100)
1  2 
etc/uams/uams_gss.c

Simple merge