]> git.donarmstrong.com Git - roundcube.git/commitdiff
Merge commit 'upstream/0.5.4+dfsg'
authorVincent Bernat <bernat@luffy.cx>
Sun, 18 Sep 2011 15:28:51 +0000 (17:28 +0200)
committerVincent Bernat <bernat@luffy.cx>
Sun, 18 Sep 2011 15:28:51 +0000 (17:28 +0200)

Trivial merge