JC Brand 34630693b7 Merge branch 'master' into roster_refactor ... Conflicts: locale/en/LC_MESSAGES/converse.po		2015-05-01 12:37:43 +02:00
..
converse.json	Release version 0.9.0	2015-03-06 18:49:31 +01:00
converse.po	Merge branch 'master' into roster_refactor	2015-05-01 12:37:43 +02:00