[DRE-commits] [ruby-hiera] 03/04: 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-hiera.

commit 8915da90fda944a4caefe70936e8a9ec4cf90118
Merge: cb5caf8 14ce36e
Author: Jonas Genannt <jonas at brachium-system.net>
Date:   Thu Nov 21 23:00:06 2013 +0100

    Merge branch 'upstream'
    
    * upstream:
      Imported Upstream version 1.3.0
    
    Conflicts:
    	debian/compat
    	debian/source/format


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