Merge tag 'v1.2.12' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 18:18:02 +0000 (13:18 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 18:18:02 +0000 (13:18 -0500)
commit0d04f20eef40c1bbd8935d18186fc1dcb25dadf4
tree1cd4c9c32c09f65dbc8e78de88460d3c73b76c6a
parentaaaf5599b51f515b73ca1bd33e1de4216a47d084
parenta21ff59eed809e2607199c6c0d8d0715838e0e99
Merge tag 'v1.2.12' into develop

v1.2.12