Merge branch 'hotfix/1.3.10' v1.3.10
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Jan 2016 19:54:23 +0000 (14:54 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Jan 2016 19:54:23 +0000 (14:54 -0500)
commit31798d614d0eff147b89eeadf9cd820ecc6f7241
treed6c67934e628a0d2685f0c7eca3f4d5669a26fa1
parentb7577ff13ea4bbb779a55a2a19b99bc2fd4fcafe
parent71379cf5a3fc4f3c8c1c6c1a7eae24e77e508035
Merge branch 'hotfix/1.3.10'