Merge remote-tracking branch 'ivan/feature/advanced_key_management' into develop
authorTomás Touceda <chiiph@leap.se>
Thu, 14 Nov 2013 18:36:32 +0000 (15:36 -0300)
committerTomás Touceda <chiiph@leap.se>
Thu, 14 Nov 2013 18:36:32 +0000 (15:36 -0300)

Trivial merge