Merge branch 'hotfix/2.1.11'
authorLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 21:40:08 +0000 (17:40 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 21:40:08 +0000 (17:40 -0400)
commit2da80a18936e55874df2ac163cf31df5890c3c35
treea0ae2fb075b96c7cbf61d5d3585c425b4f8f8e8a
parent396eebf29affe525310d71fd58a6c18d5d9963a2
parentdc33373f28e08b873e412827c88c78f15de7b8a8
Merge branch 'hotfix/2.1.11'