From: Jérémy Bobbio <lunar@debian.org>
Date: Sat, 18 Jun 2011 17:18:48 +0000 (+0200)
Subject: Merge commit 'debian/0.1-4' into debian
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ece76e4865d39a7c8687add86ef04e6d1c8b88ca;p=roundcube.git

Merge commit 'debian/0.1-4' into debian

Conflicts:
	debian/po/ar.po
	debian/po/cs.po
	debian/po/eu.po
	debian/po/fi.po
	debian/po/gl.po
	debian/po/pt.po
	debian/po/ru.po
	debian/po/ta.po
---

ece76e4865d39a7c8687add86ef04e6d1c8b88ca