From: Jérémy Bobbio Date: Sat, 18 Jun 2011 18:40:43 +0000 (+0200) Subject: Merge commit 'debian/0.3.1-4' into debian X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ffce5f392cc2fbd7ce738552af0957f47dbef18d;p=roundcube.git Merge commit 'debian/0.3.1-4' into debian Conflicts: debian/po/pt_BR.po --- ffce5f392cc2fbd7ce738552af0957f47dbef18d