From: Ralph Boehme <sloowfranklin@gmail.com>
Date: Tue, 2 Apr 2013 16:13:43 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/develop' into spotlight
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=82195e48bedce7bf1e214679c3cceb0cb33845eb

Merge remote-tracking branch 'origin/develop' into spotlight

Conflicts:
	VERSION
---

82195e48bedce7bf1e214679c3cceb0cb33845eb
diff --cc libatalk/Makefile.am
index 4ad799bf,00712dda..8254e579
--- a/libatalk/Makefile.am
+++ b/libatalk/Makefile.am
@@@ -30,8 -30,9 +30,9 @@@ VERSION_INFO = 4:0:
  #   3.0             1:0:0
  #   3.0.1           2:0:0
  #   3.0.2           3:0:0
+ #   3.0.3           4:0:0
  
 -SUBDIRS = acl adouble bstring compat cnid dsi iniparser tdb util unicode vfs
 +SUBDIRS = acl adouble bstring compat cnid dsi iniparser talloc tdb util unicode vfs
  
  lib_LTLIBRARIES = libatalk.la