Merge tag 'v1.1.12' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 15 Jun 2015 20:47:41 +0000 (16:47 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 15 Jun 2015 20:47:41 +0000 (16:47 -0400)
commit1d6e343d3a939cf84958ca5040f61523b47ed8d7
treec7c491da8723dfc3a824dc4eb5b39914bac92521
parent4395f027653f787bec7eab98a3882e45824eaaa2
parentcdc21cbfc5b84e5efd541843e17e9607111e900b
Merge tag 'v1.1.12' into develop

v1.1.12