Merge remote-tracking branch 'kanaka/master' into kotlin
authorJavier Fernandez-Ivern <javier.ivern@gmail.com>
Thu, 19 Nov 2015 02:26:25 +0000 (20:26 -0600)
committerJavier Fernandez-Ivern <javier.ivern@gmail.com>
Thu, 19 Nov 2015 02:26:25 +0000 (20:26 -0600)
commitd51639075b110668f34c2f131b280bdb350d7273
treee580b7f88edb15f23016b279a77ea19a7e72c5c9
parent69e9579c3b67f4f3bf1c0b14853db13623cbaeaa
parentf045aba128fc2d6df6444af524114447c2a5303f
Merge remote-tracking branch 'kanaka/master' into kotlin