Merge branch 'hotfix/1.0.4' v1.0.4
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 18 Jun 2015 21:05:14 +0000 (17:05 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 18 Jun 2015 21:05:14 +0000 (17:05 -0400)
commited90357bfefc0efab0da0361b6176fcb8fa499a2
tree5e7bb21365dcb0bd2b4fca0938d1bda1de6e8481
parent8aa6c22d8f34d8db5c9abc5c11e659521113a304
parent68608d36e46a0f0490e837d372bde6b0d2c0f214
Merge branch 'hotfix/1.0.4'