[DRE-commits] [ruby-rubymail] 02/11: Merge tag 'upstream/1.1.0'

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-rubymail.

commit 3e20f213c537ee635959c176c160bc1ae693c300
Merge: 6d52d14 a8abd7a
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Feb 15 13:10:57 2015 -0200

    Merge tag 'upstream/1.1.0'
    
    Upstream version 1.1.0
    
    Conflicts:
    	ChangeLog
    	Rakefile
    	version

 NEWS => ChangeLog    |   16 +-
 Rakefile             |  117 +++---
 install.rb           | 1023 --------------------------------------------------
 lib/rmail/header.rb  |    2 +-
 lib/rmail/parser.rb  |    6 +-
 lib/rmail/version.rb |    3 +
 metadata.yml         |  149 ++++++++
 test/testaddress.rb  |    8 +-
 test/testbase.rb     |    2 +-
 test/testheader.rb   |    7 +-
 test/testmessage.rb  |    2 +-
 version              |    1 -
 12 files changed, 234 insertions(+), 1102 deletions(-)

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