Merge tag 'v1.2.11' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 18:06:32 +0000 (13:06 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 18:06:32 +0000 (13:06 -0500)
commitaaaf5599b51f515b73ca1bd33e1de4216a47d084
tree2e8955551621eb47a050d456ce09d9152b154bdd
parent0e874aff3b0fc6a2bbdeabe866492dc7042083b7
parent2ee589aa82a63f405670cb1f2d36de6fba2eff35
Merge tag 'v1.2.11' into develop

v1.2.11