Merge branch 'hotfix/1.2.9' v1.2.9
authorLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 17:29:12 +0000 (12:29 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 17:29:12 +0000 (12:29 -0500)
commit43ae4e4ec6b362460e1a80ea4d8d0aa8ccfd1c35
tree391664fabe8c90e5ec5ba21830548044a6e7f73d
parent591d97c0c373bfe01cfd567a849828c2cd879dfb
parentbc20047285e6fb66d3dd96426f8ae62d3953808d
Merge branch 'hotfix/1.2.9'