Merge branch 'hotfix/1.2.29' v1.2.29
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 19 Aug 2016 18:28:19 +0000 (14:28 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 19 Aug 2016 18:28:19 +0000 (14:28 -0400)
commit7c62786b567c8209eb38baaaf11c2095ecf40a20
treee2a2e00b574c1fbb4154667a22d8353ef691e11a
parent8f82246ef787a4f4998b2e7eca40e6ab8394385e
parent0b5bc9cde1f3847613f6757c6a7c51fb991f7681
Merge branch 'hotfix/1.2.29'