[DRE-commits] [ruby-delorean] 01/04: Merge tag 'upstream/2.1.0'

[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-delorean.

commit 2568b3f1fcab322d9d95b1dcbf6b9f7f47a5549b
Merge: a3ecfed df3c21a
Author: Jonas Genannt <jonas.genannt at brachium-system.net>
Date:   Thu Oct 9 12:40:19 2014 +0200

    Merge tag 'upstream/2.1.0'
    
    Upstream version 2.1.0

 Gemfile.lock          |  4 ++--
 HISTORY.md            |  4 ++++
 README.md             |  2 +-
 delorean.gemspec      |  2 +-
 lib/delorean.rb       |  6 +++---
 spec/delorean_spec.rb | 35 +++++++++++++++++++++++++++++++++++
 6 files changed, 46 insertions(+), 7 deletions(-)

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