Merge tag 'v1.5.2' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 8 Jan 2016 17:31:42 +0000 (12:31 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 8 Jan 2016 17:31:42 +0000 (12:31 -0500)
commitd5db2edcc1b08f7c8da3251b2b0d163e634cf271
tree2810c1e779c2fa8cc89a4cc59bc8beaf78b1a322
parent16aed238371b2166ccac1843541941d52cbc212a
parentcbdb06de95c811ec52eb059dfd7c3dec8f491bbb
Merge tag 'v1.5.2' into develop

Version 1.5.2