Merge remote-tracking branch 'meskio/feature/5932_fetch_keys_uri' into develop
authordrebs <drebs@leap.se>
Thu, 9 Oct 2014 23:12:29 +0000 (20:12 -0300)
committerdrebs <drebs@leap.se>
Thu, 9 Oct 2014 23:12:29 +0000 (20:12 -0300)

Trivial merge