Merge branch 'hotfix/2.1.6' v2.1.6
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 17 Jun 2016 18:14:12 +0000 (14:14 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 17 Jun 2016 18:14:12 +0000 (14:14 -0400)
commit7b7cbfa9fa8b8b957a77be6a9ed6d219a16a1f5f
tree8ff2c05c7fa38bdb45c6dfb0c733ae70df5ddccb
parent7772c7013cc70a19d6cbf637a328e7a84f05cbc2
parentecd23ce9c25f469329e0d77faeadd268fe8544d5
Merge branch 'hotfix/2.1.6'