Merge branch 'hotfix/1.0.11' v1.0.11
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 25 Sep 2015 15:32:07 +0000 (11:32 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 25 Sep 2015 15:32:07 +0000 (11:32 -0400)
commit89826ef873c84d174bf617adf5a897ef6e3a20fe
treec201bc62ad335b9112fa7941fa4cf88598fdc34c
parent1115f6cdfffddf1338afd2bd3fc720d27f132eab
parentd85b287ec8b0e646debbb9adae30b33b229387d6
Merge branch 'hotfix/1.0.11'