From: Antonio Radici <antonio@dyne.org>
Date: Sun, 3 Oct 2010 19:41:38 +0000 (+0100)
Subject: Merge commit 'upstream/1.5.21'
X-Git-Tag: debian/1.5.21-1~3
X-Git-Url: https://git.llucax.com/software/mutt-debian.git/commitdiff_plain/90ca98902668310adea2bd544a61a3d6c9c12f1c?hp=-c

Merge commit 'upstream/1.5.21'

Conflicts:
	Makefile.in
	aclocal.m4
	config.h.in
	configure
	contrib/Makefile.in
	doc/Makefile.in
	imap/Makefile.in
	m4/Makefile.in
	po/bg.gmo
	po/ca.gmo
	po/cs.gmo
	po/da.gmo
	po/de.gmo
	po/el.gmo
	po/eo.gmo
	po/es.gmo
	po/et.gmo
	po/eu.gmo
	po/fr.gmo
	po/ga.gmo
	po/gl.gmo
	po/hu.gmo
	po/id.gmo
	po/it.gmo
	po/ja.gmo
	po/ko.gmo
	po/lt.gmo
	po/nl.gmo
	po/pl.gmo
	po/pt_BR.gmo
	po/ru.gmo
	po/sk.gmo
	po/sv.gmo
	po/tr.gmo
	po/uk.gmo
	po/zh_CN.gmo
	po/zh_TW.gmo
---

90ca98902668310adea2bd544a61a3d6c9c12f1c