zelig 096427c3b1 Merge remote-tracking branch 'upstream/develop' into feature/logging

2014-06-25 16:56:03 +01:00

..

cmd.go

merge upstream

2014-06-25 16:20:26 +01:00

keys.go

Switched to new keyring methods

2014-05-14 13:55:08 +02:00