open-keychain/OpenKeychain/src/main/java
Vincent Breitmoser 30207ee11f Merge commit '0b7fb70'
Conflicts:
	OpenKeychain/src/main/res/values/strings.xml
2014-04-22 11:30:14 +02:00
..
android/support/v4/widget Workaround for nullpointer bug in support lib, close #591 2014-04-22 08:15:55 +02:00
org/sufficientlysecure/keychain Merge commit '0b7fb70' 2014-04-22 11:30:14 +02:00