Merge remote-tracking branch 'meskio/feature/put_key_ascii' into develop
authorKali Kaneko <kali@leap.se>
Thu, 9 Oct 2014 15:35:15 +0000 (17:35 +0200)
committerKali Kaneko <kali@leap.se>
Thu, 9 Oct 2014 15:35:15 +0000 (17:35 +0200)

Trivial merge