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)

Trivial merge