Maran 8419ba0ec0 Fix merge conflicts

2014-05-22 10:26:39 +02:00

..

cmd.go

Fix merge conflicts

2014-05-22 10:26:39 +02:00

compile.go

Upgraded to new mutan

2014-05-10 16:22:57 +02:00

keys.go

Switched to new keyring methods

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