]> git.donarmstrong.com Git - roundcube.git/commitdiff
Merge commit 'debian/0.1_rc2-6' into debian
authorJérémy Bobbio <lunar@debian.org>
Sat, 18 Jun 2011 16:57:59 +0000 (18:57 +0200)
committerJérémy Bobbio <lunar@debian.org>
Sat, 18 Jun 2011 16:57:59 +0000 (18:57 +0200)
Conflicts:
debian/changelog


Trivial merge