[DRE-commits] [ruby-trollop] 04/06: Merge branch 'upstream'

[Jonas Genannt]

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

hggh-guest pushed a commit to branch master
in repository ruby-trollop.

commit 59d89fa71202e9ed39976ffe36bc690ba0d5e540
Merge: 04a853f 11c00bf
Author: Jonas Genannt <jonas at brachium-system.net>
Date:   Sat Jan 25 23:48:25 2014 +0100

    Merge branch 'upstream'
    
    * upstream:
      Imported Upstream version 2.0
      Imported Upstream version 1.16.2


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-trollop.git