Merge branch 'hotfix/1.0.4'
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Nov 2015 15:51:16 +0000 (10:51 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Nov 2015 15:51:16 +0000 (10:51 -0500)
commit05b0bd7a7cae95fae3c6d9b08816da25b8254784
treed1dcfec243918030235051fd7f8a77e5cae2e766
parentbd04052fd1abcaf1b1ffb380f638bfa11301d858
parent202f4567bcaa0bbf1bc0d022933e87fa83eef329
Merge branch 'hotfix/1.0.4'