[DRE-commits] [hiera-eyaml] 02/02: 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 hiera-eyaml.

commit 16535ff2e88e3dde4254a30e957625c649dc23cd
Merge: dc3ad05 d5c8ad0
Author: Jonas Genannt <jonas at brachium-system.net>
Date:   Tue Aug 5 19:33:39 2014 +0200

    Merge branch 'upstream'
    
    * upstream:
      Imported Upstream version 2.0.3

 Gemfile.lock                         |  31 ++++++++++++++-----------------
 checksums.yaml.gz                    | Bin 273 -> 270 bytes
 lib/hiera/backend/eyaml.rb           |   2 +-
 lib/hiera/backend/eyaml/encryptor.rb |   2 +-
 metadata.yml                         |   4 ++--
 5 files changed, 18 insertions(+), 21 deletions(-)

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