2 commits

Author	SHA1	Message	Date
Enno Rehling	bbd4e31cf9	Merge branch 'loot' of github.com:CTD1/eressea-server-bugfixing into CTD1-loot ... Conflicts: res/core/de/strings.xml	2014-11-02 10:02:30 +01:00
Enno Rehling	6bd52012c0	read keywords from json configuration, use German imperative forms.	2014-10-29 19:40:09 +01:00