]> arthur.barton.de Git - netatalk.git/commitdiff
Merge branch 'develop' of netafp.com:git/netatalk into develop
authorFrank Lahm <franklahm@googlemail.com>
Sat, 7 Apr 2012 09:24:44 +0000 (11:24 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Sat, 7 Apr 2012 09:24:44 +0000 (11:24 +0200)
1  2 
libatalk/util/netatalk_conf.c

Simple merge