[DRE-commits] [SCM] tdiary-contrib.git branch, master, updated. debian/3.2.2-1-2-g1296cf8

[Hideki Yamane]

The following commit has been merged in the master branch:
commit 1296cf8e6bfe6805a157967930484cfb7092ae36
Merge: 0a165cf18406335a530a9c0032c7035ab908dc04 3913aea9547a4de808051c08e0dd9d62a6a9f8a9
Author: Hideki Yamane <henrich at debian.org>
Date:   Thu Jun 13 08:06:44 2013 +0900

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-ruby-extras/tdiary-contrib
    
    Conflicts:
    	debian/control


-- 
tdiary-contrib.git