From: Vincent Bernat <bernat@luffy.cx>
Date: Sat, 28 Apr 2012 08:27:08 +0000 (+0200)
Subject: Merge tag 'upstream/0.7.2'
X-Git-Url: https://git.donarmstrong.com/?p=roundcube.git;a=commitdiff_plain;h=7033aedb93d429abdeccf3bceb7152b5f91dc104

Merge tag 'upstream/0.7.2'

Upstream version 0.7.2

Conflicts:
	program/include/rcmail.php.orig
---

7033aedb93d429abdeccf3bceb7152b5f91dc104