daniel oeh 0f3b77ed8e Merge branch 'newgui' into develop. closes #407
Conflicts:
	res/layout/feedinfo.xml
2014-05-19 00:04:19 +02:00
..
2013-12-29 22:13:18 +01:00
2014-04-27 21:59:31 +02:00