JC Brand 6517b9bb9d Merge branch 'otr' ... Conflicts: CHANGES.rst locale/af/LC_MESSAGES/af.js locale/af/LC_MESSAGES/converse.json locale/af/LC_MESSAGES/converse.po locale/converse.pot locale/de/LC_MESSAGES/converse.po locale/en/LC_MESSAGES/converse.po locale/es/LC_MESSAGES/converse.po locale/fr/LC_MESSAGES/converse.po locale/it/LC_MESSAGES/converse.po locale/pt_BR/LC_MESSAGES/converse.po		2013-09-15 22:08:34 +02:00
..
LC_MESSAGES	Merge branch 'otr'	2013-09-15 22:08:34 +02:00