Merge branch 'hotfix/1.2.11'
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 7 Oct 2016 20:03:56 +0000 (16:03 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 7 Oct 2016 20:03:56 +0000 (16:03 -0400)
commit2849f3f0764c42920cf4cc5c3229d74ed95d87ce
treebb4139cc1da7d44296b26e312c0c8dcb62eb7eb8
parent3808babe16fc37767061eacf3a585413e8661f7e
parentf4a933b21704a1d342efe23cbb06c93c0ef06588
Merge branch 'hotfix/1.2.11'