Robert Waltemath 46b07a6136 Merge remote-tracking branch 'upstream/master' into multiple-recurring-tasks ... Conflicts: config/locales/de.yml		2013-06-12 10:00:11 +02:00
..
de.yml	Merge remote-tracking branch 'upstream/master' into multiple-recurring-tasks	2013-06-12 10:00:11 +02:00
en.yml	finish English translation	2013-06-10 10:02:33 +02:00