[DRE-commits] [ruby-uconv] 06/06: Merge branch 'master' of git.debian.org:/git/pkg-ruby-extras/ruby-uconv

[Taku YASUI]

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

tach pushed a commit to branch master
in repository ruby-uconv.

commit 84503ed3766e48f9bc4288b5bd88213121d54f6a
Merge: 101e9e6 189e5bf
Author: Taku YASUI <tach at debian.org>
Date:   Thu Aug 15 19:16:11 2013 +0900

    Merge branch 'master' of git.debian.org:/git/pkg-ruby-extras/ruby-uconv
    
    Conflicts:
    	debian/control


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