Merge tag 'v1.1.12' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 9 Jun 2016 20:57:06 +0000 (16:57 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 9 Jun 2016 20:57:06 +0000 (16:57 -0400)
commitc2b6db00c839b1d8dee134669d48b71da3e4715e
treeb8c4638653a1a6026d15b211787c67ed717483b5
parent069842f8a124b5c114010beac460579acf1af373
parent172347aae83acafc97928a088769336914aca446
Merge tag 'v1.1.12' into develop

v1.1.12