Merge branch 'hotfix/1.0.20' v1.0.20
authorIan Weller <ian@gaslightmedia.com>
Fri, 19 Feb 2016 19:20:01 +0000 (14:20 -0500)
committerIan Weller <ian@gaslightmedia.com>
Fri, 19 Feb 2016 19:20:01 +0000 (14:20 -0500)
commit0023af917c08b18a5aabbde1bdc0d3beccacc258
treee40c3ca12feabda885d4ff900b6128cfda272c3d
parent35ac26886ced65dc26a5f44e39d9dc5e9c9e7457
parent21d1f8d8a5a96a2f072a5e0b18b5c382218c54c1
Merge branch 'hotfix/1.0.20'