[Pkg-privacy-commits] [nautilus-wipe] 196/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 285bc0a9322c8d1d670193fbd83d9b170e002265
Merge: 15fa719 134ed6e
Author: intrigeri <intrigeri at boum.org>
Date:   Sat Jun 1 13:49:25 2013 +0200

    Merge branch 'upstream'

 NEWS                                 | 10 ++++++++++
 configure.ac                         |  2 +-
 nautilus-wipe/nw-operation-manager.c |  2 +-
 nautilus-wipe/nw-progress-dialog.c   |  2 --
 nautilus-wipe/nw-progress-dialog.h   |  6 +++---
 po/de.po                             |  2 +-
 po/fr.po                             |  2 +-
 po/ru.po                             |  2 +-
 8 files changed, 18 insertions(+), 10 deletions(-)

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