From: Vincent Bernat <bernat@luffy.cx>
Date: Sun, 2 Oct 2011 13:18:48 +0000 (+0200)
Subject: Merge commit 'upstream/0.6+dfsg'
X-Git-Url: https://git.donarmstrong.com/?p=roundcube.git;a=commitdiff_plain;h=9621398b16a7cee8773b78d1fe9b53248c28a88b

Merge commit 'upstream/0.6+dfsg'
---

9621398b16a7cee8773b78d1fe9b53248c28a88b