Vesa b084e91345 Merge branch 'stable-1.1' ...

Conflicts:
	data/locale/de.qm
	data/locale/zh.qm
	data/locale/zh.ts

2014-10-19 14:58:23 +03:00

..

core

Merge branch 'stable-1.1'

2014-10-19 14:58:23 +03:00

gui

Merge branch 'stable-1.1'

2014-10-15 20:29:41 +03:00

tracks

Merge remote-tracking branch 'origin/stable-1.1'

2014-09-30 22:53:24 +02:00