Merge branch 'create-keyring'

This commit is contained in:
Vincent Breitmoser
2014-07-02 16:05:28 +02:00
10 changed files with 343 additions and 105 deletions