[DRE-commits] [ruby-rubymail] 03/04: Merge tag 'upstream/1.0.1'

[Per Andersson]

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

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

commit 200d48312f64f302876f76ee9be6e0fc70f45b11
Merge: 5308b6c 0122591
Author: Per Andersson <avtobiff at gmail.com>
Date:   Thu Oct 16 21:24:31 2014 +0200

    Merge tag 'upstream/1.0.1'
    
    Upstream version 1.0.1
    
    Conflicts:
    	NEWS
    	Rakefile
    	test/testaddress.rb
    	version

 .emacs-dirvars       |  9 +++++++++
 .gitignore           |  3 +++
 NEWS                 |  4 ++++
 Rakefile             | 10 ++++------
 lib/rmail/address.rb | 20 ++++++++++++++++----
 lib/rmail/header.rb  |  2 +-
 makedoc              |  8 ++++++++
 test/testaddress.rb  | 20 ++++++++++++++++----
 version              |  2 +-
 9 files changed, 62 insertions(+), 16 deletions(-)

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