Merge tag 'v1.1.17' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 14 Oct 2015 20:44:09 +0000 (16:44 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 14 Oct 2015 20:44:09 +0000 (16:44 -0400)
commit2d328a8898cdbf312248c98b05d514f728dfda28
tree6b3c133dd36d00fa73a03fee471becbe8a499f15
parent0b3b641dce9034fc60aaad31893ea38a578afab9
parent06bf48744a6808144feb970a0fe2dae65523529c
Merge tag 'v1.1.17' into develop

v1.1.17