[Pkg-privacy-commits] [nautilus-wipe] 01/01: Merge commit 'debian/nautiluswipe_0.1.1-3' into squeeze-backports

[Intrigeri]

This is an automated email from the git hooks/post-receive script.

intrigeri pushed a commit to branch squeeze-backports
in repository nautilus-wipe.

commit 8dff42401f871a9f9af4dcb833fac4c1298aa318
Merge: b860974 7c4c4bf
Author: intrigeri <intrigeri at boum.org>
Date:   Sun Jan 22 15:23:04 2012 +0100

    Merge commit 'debian/nautiluswipe_0.1.1-3' into squeeze-backports
    
    Conflicts:
    	debian/changelog

 debian/changelog                       | 11 +++++++----
 debian/control                         |  4 ++--
 debian/copyright                       |  2 +-
 debian/nautilus-wipe.lintian-overrides |  5 +++++
 debian/rules                           |  4 +++-
 debian/source/lintian-overrides        |  2 ++
 6 files changed, 20 insertions(+), 8 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/nautilus-wipe.git