Merge branch 'hotfix/1.0.5' v1.0.5
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 27 May 2016 14:33:37 +0000 (10:33 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 27 May 2016 14:33:37 +0000 (10:33 -0400)
commit197c5b2598b96df7d925bdee51bdbe0d043dbf10
tree0181860bc10de254e083a26cdf315cc3dde520b0
parentd2a62ddc580fbda1ca8878dc1116bfa116fe90dc
parent2a11011cfb5fcfb33824ab5b234afcae16221b6f
Merge branch 'hotfix/1.0.5'