Merge branch 'hotfix/1.0.20' v1.0.20
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 11 Mar 2016 16:18:24 +0000 (11:18 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 11 Mar 2016 16:18:24 +0000 (11:18 -0500)
commit4c96c0b786fa92838b9f347c5c14dd44289a1de4
tree4bf280350f83997cd38d9293faeba490bfcf2371
parent23e49d85aa9d7a0e9287c7c525dfa72e5af4c677
parentfb1350c16cb9c10ad2c9bbc7411d791599c81070
Merge branch 'hotfix/1.0.20'