Merge tag 'v1.0.4' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 11 Dec 2015 21:49:08 +0000 (16:49 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 11 Dec 2015 21:49:08 +0000 (16:49 -0500)
commitb5b32fd07d5b710dc9add79a7c0a09bd2da4af75
tree96a78a095d72dc155901d1ef3049815b9d99aa16
parent4f771c503558a95ab6a3e10dafb312aa549fd957
parent32ea400575835bbda6255e3c4f2adc54a6fc6396
Merge tag 'v1.0.4' into develop

1.0.4