Sebastian Imberg a692fc02c6 Merge branch 'master' of http://git.dev.miconware.de/dreamjob ... Conflicts: app/Locale/deu/LC_MESSAGES/default.mo app/Locale/deu/LC_MESSAGES/default.po		2014-04-23 10:21:20 +02:00
..
LC_MESSAGES	Merge branch 'master' of http://git.dev.miconware.de/dreamjob	2014-04-23 10:21:20 +02:00
messagesDreamjob_de.properties	Sprache work	2014-02-23 12:00:12 +01:00