Merge remote-tracking branch 'leapcode/pr/14' into develop
authorKali Kaneko <kali@leap.se>
Fri, 16 Jan 2015 16:22:37 +0000 (12:22 -0400)
committerKali Kaneko <kali@leap.se>
Fri, 16 Jan 2015 16:22:37 +0000 (12:22 -0400)
commit34659f76b7e7c61ecb998a3478286f3fb4a338b9
tree0e80d084c142cdc3cd6857e634044db67dde5fc8
parent83f36392e5086e5d40e4574b480ddaf6c10b6a64
parentc567ca60adc44b8ce575f3196d180cbb3a7e6334
Merge remote-tracking branch 'leapcode/pr/14' into develop