Gongxter 06dd3fa9fa Merge remote-tracking branch 'origin/master' ... # Conflicts: # app/src/main/java/org/secuso/privacyfriendlysudoku/ui/GameActivity.java		2016-01-31 14:24:53 +01:00
..
org/secuso/privacyfriendlysudoku	Merge remote-tracking branch 'origin/master'	2016-01-31 14:24:53 +01:00