Merge branch 'hotfix/1.2.9' v1.2.9
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 19 Jul 2016 17:09:13 +0000 (13:09 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 19 Jul 2016 17:09:13 +0000 (13:09 -0400)
commit36d040ed698c725685b643f64ce38b1d1081b2f2
treec26b70036d16e9b7491cfe8afd3c600fb3804661
parentc80474ed31f2b5d16ff2e24f711b2f754fa34f5d
parentdaa81ba14c5f9b51047ce5a05f5b286446bdd59f
Merge branch 'hotfix/1.2.9'