]> arthur.barton.de Git - netatalk.git/commitdiff
Merge from branch-2-1
authorFrank Lahm <franklahm@googlemail.com>
Tue, 16 Nov 2010 14:25:00 +0000 (15:25 +0100)
committerFrank Lahm <franklahm@googlemail.com>
Tue, 16 Nov 2010 14:25:00 +0000 (15:25 +0100)
1  2 
libatalk/cnid/dbd/cnid_dbd.c
libatalk/util/socket.c

Simple merge
Simple merge