Merge branch 'release/1.0.17' v1.0.17
authorLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 13:46:38 +0000 (09:46 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 13:46:38 +0000 (09:46 -0400)
commitc95fe25468f55cd766342a33d49a6985ef0b9170
tree17a7cbbdeabb4359cf2c3037e0d40386635161b6
parent72f8810a9d569245bd28bf2558e635ca00397b63
parent1c350170b6498edf0686a27901c02076c45939fc
Merge branch 'release/1.0.17'