daniel oeh 4fca178972 Merge branch 'issue-39' into develop
Conflicts:
	res/values/ids.xml
2013-02-22 23:10:13 +01:00
..
2012-07-15 15:55:42 +02:00
2013-02-02 23:36:00 +01:00
2013-01-20 00:02:29 +01:00
2013-01-19 23:38:41 +01:00
2013-01-20 00:02:29 +01:00
2012-07-23 13:50:08 +02:00
2012-07-23 17:05:34 +02:00
2013-01-20 00:02:29 +01:00
2013-01-20 00:02:29 +01:00
2012-07-24 14:37:34 +02:00