Merge tag 'v1.2.15' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 23 Nov 2015 20:25:20 +0000 (15:25 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 23 Nov 2015 20:25:20 +0000 (15:25 -0500)
commitd3be41f18a50298d56a5e8845fac244921dfd703
treeb1ec5abb0ba4cea4b2093d3566c2da7f8bfab05d
parent0876062157f07f53c6a05754c1df6ba04da22711
parente9c6a906d60b4907ec65f19ce60c18cc9c9a0196
Merge tag 'v1.2.15' into develop

1.2.15