daniel oeh 4fca178972 Merge branch 'issue-39' into develop
Conflicts:
	res/values/ids.xml
2013-02-22 23:10:13 +01:00
..
2012-11-23 20:15:21 +01:00
2013-02-22 23:10:13 +01:00