]> arthur.barton.de Git - netatalk.git/commit - etc/afpd/main.c
Merge remote-tracking branch 'origin/develop' into spotlight
authorRalph Boehme <sloowfranklin@gmail.com>
Tue, 5 Mar 2013 10:52:11 +0000 (11:52 +0100)
committerRalph Boehme <sloowfranklin@gmail.com>
Tue, 5 Mar 2013 10:52:11 +0000 (11:52 +0100)
commit48af5314c0219b42d13057d907e6837de437a015
treedd1309816063d3914f21cfd82d0f6937866d3a46
parent42eb54de3f6373cd394fbd6abfb86d85c8dde935
parentcc423db772cec28174dae0076beda17115d7088a
Merge remote-tracking branch 'origin/develop' into spotlight
etc/afpd/main.c