[Pkg-privacy-commits] [nautilus-wipe] 04/05: Merge branch 'master' into squeeze-backports

[Ulrike Uhlig]

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

u-guest pushed a commit to annotated tag debian/nautiluswipe_0.1.1-1_bpo60+1
in repository nautilus-wipe.

commit 18f6918f1d3e3785ae5a98601b8ea4ecff55e379
Merge: ca2cc8d bbfac96
Author: intrigeri <intrigeri at boum.org>
Date:   Fri Aug 19 15:50:00 2011 +0200

    Merge branch 'master' into squeeze-backports
    
    Conflicts:
    	debian/changelog

 debian/changelog | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

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