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
..
default.mo	erste Text Änderungen	2014-04-17 11:02:49 +02:00
default.po	Merge branch 'master' of http://git.dev.miconware.de/dreamjob	2014-04-23 10:21:20 +02:00