daniel oeh 0f3b77ed8e Merge branch 'newgui' into develop. closes #407
Conflicts:
	res/layout/feedinfo.xml
2014-05-19 00:04:19 +02:00
..
2014-03-22 18:22:59 +01:00
2014-03-22 18:22:59 +01:00
2012-07-31 13:09:05 +02:00
2012-07-20 13:27:41 +02:00
2014-04-26 23:07:11 +02:00
2014-04-26 23:07:11 +02:00