Merge branch 'hotfix/1.2.2' v1.2.2
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 24 Oct 2016 15:38:36 +0000 (11:38 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 24 Oct 2016 15:38:36 +0000 (11:38 -0400)
commitf8c78b7c3c0cd9e485a1e7532e3154bbd5638cdf
treee03b5b3bbd533ff68ccbbcf0c5028f338deacb32
parent6a04b1a8ab60d99ebb0b675f12b02d05a74747bb
parent256e8c5201eb49538aa3700d6807c541da2971c7
Merge branch 'hotfix/1.2.2'