Merge commit 'jelmer/master'

Conflicts:

	debian/changelog

diff --cc debian/changelog
index 6ee0f56407d154f4fac3bfb66a49d0a1cca1dfa3,63856356b593db6a78780223706e3fdd98a49149..471b14fc611d41adbea99f24d1893b9ea408728c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,9 +1,15 @@@
  etckeeper (0.15) UNRELEASED; urgency=low
  
    * Support for the new bzr pre-commit hook. This requires bzr version 1.4.
 +    (Jelmer Vernooij)
+     Closes: #473069
 +  * bzr: Set nickname for tree in init.d/40vcs-init (Daniel Hahler)
 +  * Add script to add new files during "commit" for bzr (commit.d/30bzr-add).
 +    (Daniel Hahler)
 +  * Fix handling of files with spaces, by setting IFS to "newline" in
 +    commit.d/40bzr-rm and commit.d/40git-rm (Daniel Hahler)
  
-  -- Joey Hess <joeyh@debian.org>  Sat, 05 Apr 2008 14:39:10 -0400
+  -- Jelmer Vernooij <jelmer@samba.org>  Sat, 05 Apr 2008 20:59:44 +0200
  
  etckeeper (0.14) unstable; urgency=low