[Pkg-privacy-commits] [onioncat] 275/340: Merge remote-tracking branch 'remotes/trunk' into upstream

[Ximin Luo]

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

infinity0 pushed a commit to branch debian
in repository onioncat.

commit 5aeb46f0560d09668315bdd2fbbf8b9371db5028
Merge: 21480d9 af8dd37
Author: intrigeri <intrigeri at boum.org>
Date:   Wed Aug 24 17:49:18 2011 +0200

    Merge remote-tracking branch 'remotes/trunk' into upstream

 configure  | 22 +++++++++++-----------
 man/ocat.1 | 20 ++++++++++----------
 2 files changed, 21 insertions(+), 21 deletions(-)

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