Merge branch 'hotfix/1.2.11' v1.2.11
authorLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 18:06:24 +0000 (13:06 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 18:06:24 +0000 (13:06 -0500)
commit2ee589aa82a63f405670cb1f2d36de6fba2eff35
tree2e8955551621eb47a050d456ce09d9152b154bdd
parent18f0ffe58046217f1665a41cca18ead741a761b4
parent910fafe186570dee128292e28fa83196f0a7b228
Merge branch 'hotfix/1.2.11'