Merge tag 'v1.1.26' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 21:06:43 +0000 (17:06 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 21:06:43 +0000 (17:06 -0400)
commit6b2de7c1414685f9e24cd895cfcd37b8f0f0c579
tree3fbdc65f5daffe99ddce30a53868fec7bc4d093a
parent0aec86becc6a09b692f2a6cb5133d309fb54a63c
parentd38226745f0aa33a422e4d413b04549ec87ad90b
Merge tag 'v1.1.26' into develop

v1.1.26