Merge branch 'hotfix/1.2.13' v1.2.13
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 28 Jun 2016 17:05:20 +0000 (13:05 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 28 Jun 2016 17:05:20 +0000 (13:05 -0400)
commit13d932372eac6d225bfc4b38f66777b47e402789
tree18433ab2a1763e574601861bb13a4923e1984378
parenta88a1381d6559e0b85ffe29f88b8f3bafe6d0142
parent2c0db88d5cc6b8e4c4a5480a7d9a8f8efbb8abe2
Merge branch 'hotfix/1.2.13'