Merge branch 'hotfix/1.0.21' v1.0.21
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 11 Mar 2016 16:21:28 +0000 (11:21 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 11 Mar 2016 16:21:28 +0000 (11:21 -0500)
commit761d17337986370bb5e1ea74a72fc86a368cf323
treef159541575632db82a16c444b983d9d8ef26e5ab
parent4c96c0b786fa92838b9f347c5c14dd44289a1de4
parenta8d58e48ab980816c9646a6037a52c26b5a770c4
Merge branch 'hotfix/1.0.21'