Commit Graph

5 Commits

Author SHA1 Message Date
Michael Tremer
0fc392d65d Merge branch 'master' into fifteen 2013-11-20 21:43:20 +01:00
Michael Tremer
0b7f6aa4d9 Merge branch 'next' into fifteen 2013-10-14 14:13:39 +02:00
Michael Tremer
568438067c Merge branch 'next' into fifteen 2013-10-14 14:12:04 +02:00
Michael Tremer
0203401cf5 Merge remote-tracking branch 'origin/next' into fifteen
Conflicts:
	doc/language_issues.es
	doc/language_issues.fr
	doc/language_issues.nl
	doc/language_issues.pl
	doc/language_issues.tr
	doc/language_missings
2013-10-03 14:26:33 +02:00
Arne Fitzenreiter
b751cd7a4c move core70-73 to oldcore. 2013-08-27 20:18:53 +02:00