Merge branch 'hotfix/1.3.6'
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 3 Aug 2015 16:38:04 +0000 (12:38 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 3 Aug 2015 16:38:04 +0000 (12:38 -0400)
commit244acaf5ce3abc638ca0bf3f5a11915ffab2d504
treef4c9116085397701afa6f12ced62a1a4def18916
parent59d5594b87316e87f30de0f93be7ac383c42f1e5
parentd89a478941ee96106a83c8f0f81c69aa8a10f09a
Merge branch 'hotfix/1.3.6'