Merge tag 'v1.2.5' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Jun 2016 18:40:37 +0000 (14:40 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Jun 2016 18:40:37 +0000 (14:40 -0400)
commit6f60d11ea3068216a8f7a47f8182b51051aa5446
treeb85f95dc5869be78cf7a6a1319c1cdd53b7daed0
parent597472cea42c4855e6bcd7bbbb41fd24c239c4a0
parent3f4d0054f327d930bb637ae676e5513c53776e7b
Merge tag 'v1.2.5' into develop

Verlsion 1.2.5