Merge branch 'hotfix/1.1.12' v1.1.12
authorLaury GvR <laury@gaslightmedia.com>
Mon, 15 Jun 2015 20:47:28 +0000 (16:47 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 15 Jun 2015 20:47:28 +0000 (16:47 -0400)
commitcdc21cbfc5b84e5efd541843e17e9607111e900b
treec7c491da8723dfc3a824dc4eb5b39914bac92521
parent216bdcb4ec007a1ab5c807ae1022b599d4666887
parentbc46b5424ec3eefabb53022816d7a22b08dab067
Merge branch 'hotfix/1.1.12'