Merge branch 'hotfix/1.1.6'
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 18 Mar 2016 20:08:21 +0000 (16:08 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 18 Mar 2016 20:08:21 +0000 (16:08 -0400)
commit2294f1fef1c4fe47472375b5ee5b43232ba43c28
treeb52e139fae930011cb8dbaf31a60f64c16808de4
parent6d21515737ff7346b6e65c6199bf92aea25acae0
parent9cad1817cf7b657f790453335f867186f48f0b30
Merge branch 'hotfix/1.1.6'