Merge tag 'v1.0.16' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 8 Jan 2016 22:30:48 +0000 (17:30 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 8 Jan 2016 22:30:48 +0000 (17:30 -0500)
commit37dcaf33257f6a35317927ae0c23feada6cc113a
tree024423a43ded62f7329df4924d7aa56b1fa6fac6
parent11faa0d80a1b62170b4b8a55d82da792ba677fa2
parent58b6d210c8985b3c5b87ef058288c4d2cb46d172
Merge tag 'v1.0.16' into develop

fixing syntax error