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)
commite137a622440779acada41fe16a07bf4598645c06
treeba5ac3ce859cfda7213b9c359e34bd2fc3be7da8
parent4daab9b4bb279679611c1e4ec51c08f5987be27c
parentd88afefd26592f91edbf3f5a2eea165508ca4afa
Merge remote-tracking branch 'ivan/feature/advanced_key_management' into develop