Merge branch 'hotfix/1.2.11' v1.2.11
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 23 Jun 2016 18:18:56 +0000 (14:18 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 23 Jun 2016 18:18:56 +0000 (14:18 -0400)
commit19cdf311b0ef4ec3633189347db77bf7a6652d4b
treeda25f7842e44f91130e524d8ddad5e6840491771
parent9b04c53fdbd7c25eda9a9dab1a0d494427406be6
parent44c42d4f0a856562ebf095ebefa79160540ffd96
Merge branch 'hotfix/1.2.11'