Merge tag 'v1.2.26' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 9 Jun 2016 15:51:00 +0000 (11:51 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 9 Jun 2016 15:51:00 +0000 (11:51 -0400)
commit657b9731c54df179384911f50c995d5005ff6097
tree8efc38fa59f68b02d3ac0dfb6515fb349091596e
parent5f3ca47670fb9d107d1c901dbf6ca8f2f5c0b2ab
parent25a98974eda9c95e7acff933135eded85d0eedbc
Merge tag 'v1.2.26' into develop

v1.2.26