Merge branch '3.0' into 3.1

Conflicts:
	apache/.md5sum
	apache/Pkgfile

tdb/.footprint

@@ -7,9 +7,9 @@ drwxr-xr-x	root/root	usr/bin/
 drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/tdb.h
 drwxr-xr-x	root/root	usr/lib/
-lrwxrwxrwx	root/root	usr/lib/libtdb.so -> libtdb.so.1.2.12
-lrwxrwxrwx	root/root	usr/lib/libtdb.so.1 -> libtdb.so.1.2.12
--rwxr-xr-x	root/root	usr/lib/libtdb.so.1.2.12
+lrwxrwxrwx	root/root	usr/lib/libtdb.so -> libtdb.so.1.2.13
+lrwxrwxrwx	root/root	usr/lib/libtdb.so.1 -> libtdb.so.1.2.13
+-rwxr-xr-x	root/root	usr/lib/libtdb.so.1.2.13
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/tdb.pc
 drwxr-xr-x	root/root	usr/lib/python2.7/

tdb/.md5sum

@@ -1,2 +1,2 @@
-53e6168a7c2c93735a1c024fd2c3a7b4  tdb-1.2.12.tar.gz
-9defe394f24ce99dc6a39589c863b4c1  tdb-man-1.2.12.tar.xz
+2dc44a8538c4c8fcc9f9ba00fb041ce4  tdb-1.2.13.tar.gz
+96a0b0f131524ab4d71d61e9099c7cef  tdb-man-1.2.13.tar.xz

tdb/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on:  python
 
 name=tdb
-version=1.2.12
+version=1.2.13
 release=1
 source=(http://www.samba.org/ftp/$name/$name-$version.tar.gz
         $name-man-$version.tar.xz)