]> arthur.barton.de Git - netatalk.git/commit
Merge remote-tracking branch 'origin/branch-netatalk-3-0' into develop
authorRalph Boehme <sloowfranklin@gmail.com>
Tue, 4 Jun 2013 10:38:23 +0000 (12:38 +0200)
committerRalph Boehme <sloowfranklin@gmail.com>
Tue, 4 Jun 2013 10:38:23 +0000 (12:38 +0200)
commitec0ae51672bb9f91be79ba28edd70ac36bf36211
tree65ac53c75784156d8f6adb1142ddc31eae599b03
parent952a2d8e011254243e5c3707ef857eab01625f93
parent866ca0b3e165f6aa93b29c0eb4997150f286b0d3
Merge remote-tracking branch 'origin/branch-netatalk-3-0' into develop

Conflicts:
NEWS
NEWS
configure.ac
include/atalk/dsi.h
macros/netatalk.m4
macros/summary.m4