]> arthur.barton.de Git - netatalk.git/commit
Merge remote-tracking branch 'origin/develop' into spotlight
authorRalph Boehme <sloowfranklin@gmail.com>
Tue, 2 Apr 2013 16:13:43 +0000 (18:13 +0200)
committerRalph Boehme <sloowfranklin@gmail.com>
Tue, 2 Apr 2013 16:13:43 +0000 (18:13 +0200)
commit82195e48bedce7bf1e214679c3cceb0cb33845eb
treea31d2dd1860c961443d7594f5c019a53792d4e1b
parentb3aa86438c224bc7fea23a4b096de476f425ed90
parent8a31fe1c9da97425ff8636da56dbbec914f754b3
Merge remote-tracking branch 'origin/develop' into spotlight

Conflicts:
VERSION
bin/ad/ad_util.c
libatalk/Makefile.am
macros/netatalk.m4
macros/summary.m4