Merge branch 'hotfix/1.1.5' v1.1.5
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 18 Mar 2016 20:02:00 +0000 (16:02 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 18 Mar 2016 20:02:00 +0000 (16:02 -0400)
commit57f0249cfd32dc6e20a2ba2a4a89edb8c747160a
treec46239c9f312b0f873cdb20c2472ecee63f4a3d2
parent49d19d60b634e4234ef10e8dcfe963fe5ceb8f59
parent8e4007224aae269226c77990c120ab9733dd9499
Merge branch 'hotfix/1.1.5'