]> arthur.barton.de Git - netatalk.git/commit
Merge remote branch 'sf/product-2-2' into develop
authorFrank Lahm <franklahm@googlemail.com>
Fri, 17 Aug 2012 12:21:52 +0000 (14:21 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Fri, 17 Aug 2012 12:21:52 +0000 (14:21 +0200)
commitd2968df026cd9971caeab102f9348152b08b9132
tree52d6af75bc5de03ce8492c5500b9a06b69f86802
parentb53396732a81311bec08c96ebc5ad6df58308980
parent7b0d29af36a600a95fbc562a47f932139e26c900
Merge remote branch 'sf/product-2-2' into develop

Conflicts:
etc/afpd/afp_dsi.c
libatalk/dsi/dsi_stream.c
NEWS
etc/afpd/afp_dsi.c
etc/afpd/auth.c
etc/uams/uams_dhx2_pam.c
include/atalk/globals.h