JC Brand 34630693b7 Merge branch 'master' into roster_refactor ... Conflicts: locale/en/LC_MESSAGES/converse.po		2015-05-01 12:37:43 +02:00
..
LC_MESSAGES	Merge branch 'master' into roster_refactor	2015-05-01 12:37:43 +02:00