msquare 3873b8dc61 Merge branch 'pr/276' ... # Conflicts: # locale/de_DE.UTF-8/LC_MESSAGES/default.mo # locale/de_DE.UTF-8/LC_MESSAGES/default.po		2016-11-15 15:35:55 +01:00
..
LC_MESSAGES	Merge branch 'pr/276'	2016-11-15 15:35:55 +01:00