Vincent Breitmoser 0b16a4edfd Merge remote-tracking branch 'origin/master' ... Conflicts: OpenKeychain/src/main/AndroidManifest.xml		2014-09-29 21:32:21 +02:00
..
android/support/v4/widget	Hack to disable overscroll effect of swipe to update	2014-09-13 23:08:04 +02:00
org	Merge remote-tracking branch 'origin/master'	2014-09-29 21:32:21 +02:00