From: Vincent Bernat <bernat@luffy.cx>
Date: Sun, 18 Sep 2011 15:28:51 +0000 (+0200)
Subject: Merge commit 'upstream/0.5.4+dfsg'
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;ds=sidebyside;h=30cf253f13b663945d59dcae807681e7a3b3052e;p=roundcube.git

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

30cf253f13b663945d59dcae807681e7a3b3052e