Merge branch 'hotfix/1.0.22' v1.0.22
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 18 Mar 2016 19:42:05 +0000 (15:42 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 18 Mar 2016 19:42:05 +0000 (15:42 -0400)
commit54beb8b41ac6a83d960d8af8a904d7c18d54b7d4
treee878920597a492f6a360ceb24965027a4a018c83
parentf6db636c2087a2f54d41b86e9820df2da572b527
parent02fe4725608fdc5f6dc8ccf6451192bc79b68688
Merge branch 'hotfix/1.0.22'