Merge tag 'v1.2.29' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 19 Aug 2016 18:28:25 +0000 (14:28 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 19 Aug 2016 18:28:25 +0000 (14:28 -0400)
commitf51a6e70a1b3cd1b37c63fa5a5dba206fac394ae
treee2a2e00b574c1fbb4154667a22d8353ef691e11a
parenta1d89eb2f1f2f0477df42fc0285bde258d50392f
parent7c62786b567c8209eb38baaaf11c2095ecf40a20
Merge tag 'v1.2.29' into develop

fixing syntax error