Merge remote-tracking branch 'origin/develop' into spotlight
authorRalph Boehme <sloowfranklin@gmail.com>
Mon, 4 Mar 2013 20:50:58 +0000 (21:50 +0100)
committerRalph Boehme <sloowfranklin@gmail.com>
Mon, 4 Mar 2013 20:50:58 +0000 (21:50 +0100)
commit42eb54de3f6373cd394fbd6abfb86d85c8dde935
tree19f3b0a0b0111d2653f8e8ff0ec1bee311572e98
parent5e440203e5a68c1a685b69196a314d3b88e0c861
parentbb8bc51e54795edffc1d2b70cb232eba79b97ffb
Merge remote-tracking branch 'origin/develop' into spotlight

Conflicts:
include/atalk/globals.h
etc/afpd/main.c
include/atalk/globals.h
libatalk/util/netatalk_conf.c
macros/netatalk.m4