From: Jérémy Bobbio <lunar@debian.org>
Date: Sat, 18 Jun 2011 16:57:59 +0000 (+0200)
Subject: Merge commit 'debian/0.1_rc2-6' into debian
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1c8592175a97131e24fd9784d8436c5268804e40;p=roundcube.git

Merge commit 'debian/0.1_rc2-6' into debian

Conflicts:
	debian/changelog
---

1c8592175a97131e24fd9784d8436c5268804e40