Merge branch 'hotfix/1.2.12' v1.2.12
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 28 Jun 2016 16:31:16 +0000 (12:31 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 28 Jun 2016 16:31:16 +0000 (12:31 -0400)
commita88a1381d6559e0b85ffe29f88b8f3bafe6d0142
treec727275ba7ccb129b80ca85640da46dbc8e958e5
parent19cdf311b0ef4ec3633189347db77bf7a6652d4b
parent218d36f606e95776f286dea7b3d1b40cff709a20
Merge branch 'hotfix/1.2.12'