Merge tag 'v1.1.25' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 13:56:58 +0000 (09:56 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 13:56:58 +0000 (09:56 -0400)
commit0aec86becc6a09b692f2a6cb5133d309fb54a63c
treeb63570d2ac8e18fede1ff699d7ee2130b427a99b
parent0141b812eac79b2d12cbe1f52f4eb6d93370824c
parent0d1667bbc296eeac84abbd1f0d7d5983c1e73059
Merge tag 'v1.1.25' into develop

v1.1.25