Merge branch 'master' into samba_4.1

Conflicts:
	debian/changelog

diff --cc debian/changelog
index a534237cf68d44d83219c4d34cc0aa4740a2fb13,11cc04ecca28deb5ca6821b15abbaff32fa34e95..414dba9cf0fd769b357ba61502c89a632a4453bf
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,28 -1,18 +1,41 @@@
- samba (2:4.0.12+dfsg-2) UNRELEASED; urgency=low
 +samba (2:4.1.3+dfsg-1) UNRELEASED; urgency=low
 +
 +  [ Jelmer Vernooij ]
 +  * New upstream release.
 +   + Drop 0002-lib-replace-Allow-OS-vendor-to-assert-that-getpass-i.patch:
 +     upstream no longer uses getpass.
 +  * Add source dependency on libntdb1, and stop passing --disable-ntdb,
 +    which has been removed.
 +  * Remove handling for SWAT, which is no longer shipped upstream.
 +  * Split VFS modules out from samba-libs into a separate binary
 +    package.
 +  * Move service and process_model modules from the samba-libs to the
 +    samba package. Prevents dependencies on libkdc2-heimdal and
 +    libhdb9-heimdal.
 +
 +  [ Ivo De Decker ]
 +  * Add build-dep on python-ntdb.
 +  * Add build-dep on libncurses5-dev.
 +  * Add depends on python-ntdb to samba.
 +  * New upstream release.
 +
 + -- Jelmer Vernooij <jelmer@debian.org>  Sun, 17 Nov 2013 11:47:57 +0000
 +
+ samba (2:4.0.13+dfsg-2) UNRELEASED; urgency=low
  
+   [ Steve Langasek ]
+   * Check for alternative's presence before calling update-alternatives
+     --remove-all, instead of silently ignoring all errors from
+     update-alternatives.
+ 
+   [ Debconf translations ]
+   * Spanish (Javier Fernández-Sanguino).  Closes: #731800
+ 
+  -- Steve Langasek <vorlon@debian.org>  Mon, 09 Dec 2013 11:13:59 -0800
+ 
+ samba (2:4.0.13+dfsg-1) unstable; urgency=high
+ 
+   [ Steve Langasek ]
    * Move update-alternatives upgrade removal handling to the postinst, where
      it belongs.  Closes: #730090.
    * Really remove all references to encrypted passwords: the