Merge branch 'hotfix/2.0.12' v2.0.12
authorIan Weller <ian@gaslightmedia.com>
Mon, 27 Jun 2016 12:52:15 +0000 (08:52 -0400)
committerIan Weller <ian@gaslightmedia.com>
Mon, 27 Jun 2016 12:52:15 +0000 (08:52 -0400)
commita0a30ef01dabb8d940fe7b99051100e87c3960dd
treeefec23295e8399a84e150823eb24d57b01be1b6b
parent46c8f02e56c7583ee83407803cbff2b6d18521a1
parent5354097fa41bfe3a14e9c6ab1389b4d8f8ce3d45
Merge branch 'hotfix/2.0.12'