Merge tag 'v1.1.17' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 16 Apr 2015 13:35:08 +0000 (09:35 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 16 Apr 2015 13:35:08 +0000 (09:35 -0400)
commit79a14c41d30a589eb49f8b1037445caff3787a1e
tree0c020c2920b33f1b2e52c8f068a001951b6981db
parentda4e8952603d7b2174dd9f4dbc549df482c74660
parent234577db3703f8e4b10fe8c4d481049a8b54e1a9
Merge tag 'v1.1.17' into develop

v1.1.17