Merge branch 'hotfix/1.2.10' v1.2.10
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Sep 2016 18:36:01 +0000 (14:36 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Sep 2016 18:36:01 +0000 (14:36 -0400)
commit0e60d72b0e1f08286b67550418c51b94ab99d9c6
treebbad6e7f10c474b8f2c7fddf50ab1b83c7a9bcec
parent36d040ed698c725685b643f64ce38b1d1081b2f2
parent30d3aa425a8dc633f1c7bb932085c1793ba3e298
Merge branch 'hotfix/1.2.10'