fkloft 4234ee15b4 Merge branch 'master' into newnavigation
Conflicts:
	mobile/src/com/cradle/iitc_mobile/IITC_ActionBarHelper.java
2013-09-23 11:01:03 +02:00
..