Merge branch 'create-keyring'

This commit is contained in:
Vincent Breitmoser committed 2014-07-02 16:05:28 +02:00
commit 100b5f4c5f
10 files changed
+343 -105

No files matched your search