Merge tag 'v1.2.5' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 16 Dec 2016 14:51:55 +0000 (09:51 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 16 Dec 2016 14:51:55 +0000 (09:51 -0500)
commitb8d0505a4501fbe806452ca9b37f31c5a7ca7103
tree9092d1f8bb9fcc601f560b508ab5e9c2ba8f7d97
parent44f2b2b3d46449ee5c8319502b16123523e9bf66
parenta9ff90b084717f9c2862e306baeae175e2adc6d1
Merge tag 'v1.2.5' into develop

Version 1.2.5