Merge branch 'hotfix/1.0.20' v1.0.20
authorIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 19:04:38 +0000 (15:04 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 19:04:38 +0000 (15:04 -0400)
commit8a564f2795576cedab59964451a61051c0b07138
tree01833db46ad2c112336ffac4eb684f13938dcfc1
parent7ff6491294fdfc29aad833f4d6c52d31b1c9c02c
parent452637565ad6cb34a3ce37c8cd0b512bd647b78b
Merge branch 'hotfix/1.0.20'