Merge branch 'hotfix/1.2.12' v1.2.12
authorLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 18:17:56 +0000 (13:17 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 18:17:56 +0000 (13:17 -0500)
commita21ff59eed809e2607199c6c0d8d0715838e0e99
tree1cd4c9c32c09f65dbc8e78de88460d3c73b76c6a
parent2ee589aa82a63f405670cb1f2d36de6fba2eff35
parentbcc54c28783e59068f473543147280088bd4dc86
Merge branch 'hotfix/1.2.12'