[Pkg-privacy-commits] [onioncat] 239/340: Merge remote branch 'remotes/trunk' into debian

[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 1b379e84aa4e9a8225d505ef0208cd027f73e5fa
Merge: 09f0dfc 3c24d63
Author: intrigeri <intrigeri at boum.org>
Date:   Mon Jun 6 08:50:29 2011 +0200

    Merge remote branch 'remotes/trunk' into debian

 Makefile.am         |   2 +-
 Makefile.in         |   2 +-
 configure           |  26 +++--
 configure.ac        |   2 +-
 debian/Makefile.am  |   2 -
 debian/Makefile.in  | 293 ----------------------------------------------------
 freebsd/Makefile.am |   2 -
 freebsd/Makefile.in | 293 ----------------------------------------------------
 8 files changed, 15 insertions(+), 607 deletions(-)

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