Merge branch 'release/1.2.5' v1.2.5
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 16 Dec 2016 14:51:30 +0000 (09:51 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 16 Dec 2016 14:51:30 +0000 (09:51 -0500)
commita9ff90b084717f9c2862e306baeae175e2adc6d1
tree9092d1f8bb9fcc601f560b508ab5e9c2ba8f7d97
parent5c29ec652a5e937c31863471b9a3b96b53f652ed
parent44f2b2b3d46449ee5c8319502b16123523e9bf66
Merge branch 'release/1.2.5'