Merge branch 'hotfix/1.0.25'
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 18 Mar 2016 20:13:34 +0000 (16:13 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 18 Mar 2016 20:13:34 +0000 (16:13 -0400)
commit290ae1f7c51c9997b998e168d28a5f9ed18aa091
tree3b953deb4c91e3cfae06236ba3f8a4f84c2bd79e
parent8ed435e0446c287f273bad114d6512b885ab1fb2
parent0bd5cdfaf750f4e47300175f8c6869b40ab0f0b8
Merge branch 'hotfix/1.0.25'