Merge branch 'hotfix/1.0.4' v1.0.4
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 21 Dec 2015 19:02:18 +0000 (14:02 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 21 Dec 2015 19:02:18 +0000 (14:02 -0500)
commit05b0b426ea6c852f1e537413a5cd730bfc584bdc
treedae6340cb9035d9cebefa45abc640cdbbccefadc
parentdc39738ae8ac9ccfe062758cfe7cb813da356771
parent9e479ba0011a5cd0b589c776a89182c2ad255471
Merge branch 'hotfix/1.0.4'