Merge branch 'hotfix/1.3.11' v1.3.11
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Jan 2016 20:42:58 +0000 (15:42 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Jan 2016 20:42:58 +0000 (15:42 -0500)
commita1725927909c4a04b144f9c7a6daee0327a89a98
tree007b6b180cce26bca6634c3917f0724734f4ea50
parent31798d614d0eff147b89eeadf9cd820ecc6f7241
parent2a19a0a2e014da6ae5502e25ee8850c611e5b669
Merge branch 'hotfix/1.3.11'