[Pkg-privacy-commits] [nautilus-wipe] 211/224: Merge branch 'upstream'

[Ulrike Uhlig]

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

u-guest pushed a commit to branch master
in repository nautilus-wipe.

commit 3bb7fecc7f557ea8d621aaed9125af7f1fa91ef0
Merge: 917f6fa 151555a
Author: intrigeri <intrigeri at boum.org>
Date:   Fri Jan 24 14:19:21 2014 +0000

    Merge branch 'upstream'

 .gitignore   | 2 ++
 NEWS         | 8 ++++++++
 configure.ac | 4 ++--
 3 files changed, 12 insertions(+), 2 deletions(-)

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