Merge branch 'release/1.1.17' v1.1.17
authorLaury GvR <laury@gaslightmedia.com>
Wed, 14 Oct 2015 20:44:01 +0000 (16:44 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 14 Oct 2015 20:44:01 +0000 (16:44 -0400)
commit06bf48744a6808144feb970a0fe2dae65523529c
tree6b3c133dd36d00fa73a03fee471becbe8a499f15
parent391d57b506aca2ad34143e0c3d325dcf1e0a40bb
parent0b3b641dce9034fc60aaad31893ea38a578afab9
Merge branch 'release/1.1.17'