Merge tag 'v1.5.25' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Sat, 21 May 2016 10:30:48 +0000 (06:30 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Sat, 21 May 2016 10:30:48 +0000 (06:30 -0400)
commitd301f7f1570c4676ce9e7bd78e90773b65b49ef4
tree348244c09b29927d055ff8f730a37795a9030c73
parent8f2c69c147b64dbdb294d48f2646f6a4998473b6
parent234978bdaf07388e376e8efb724dbf1589b50a64
Merge tag 'v1.5.25' into develop

Version 1.5.25