1
0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-02-26 16:31:46 -05:00
Vincent Breitmoser 30207ee11f Merge commit '0b7fb70'
Conflicts:
	OpenKeychain/src/main/res/values/strings.xml
2014-04-22 11:30:14 +02:00
..
2014-04-22 11:30:14 +02:00
2014-04-09 16:36:28 +02:00