Merge branch 'hotfix/1.0.4'
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 23 Feb 2016 19:13:25 +0000 (14:13 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 23 Feb 2016 19:13:25 +0000 (14:13 -0500)
commitd537c7408dbf5764286b0206581b0a71b131e70e
tree332dac88d6b7b25f06a876ae7a7f272af5c054a4
parentd97ed0dec66e73f952f5f5bff13e4ca19ab310c9
parent8bd8e7e10f7b714289d5126e6e8647b63f22bbc3
Merge branch 'hotfix/1.0.4'