#94: Added keyring parameters to request; added new Keyserver API for changing keyrings
Merge branch 'master' of github.com:backmeup/backmeup-prototype
Merge branch 'master' of github.com:backmeup/backmeup-prototype