[DRE-commits] [ruby-parslet] 02/04: Merge branch 'upstream'

[Jonas Genannt]

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

genannt pushed a commit to branch master
in repository ruby-parslet.

commit fcbe3ad4edf11bb32374cfde4cfd4d8e589b88f3
Merge: 0c9f3eb 62a0e4a
Author: Jonas Genannt <jonas at brachium-system.net>
Date:   Wed Aug 19 15:32:03 2015 +0200

    Merge branch 'upstream'
    
    * upstream:
      Imported Upstream version 1.7.0
      Imported Upstream version 1.6.1


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