Merge tag 'v1.2.10' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 18:00:32 +0000 (13:00 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 18:00:32 +0000 (13:00 -0500)
commit0e874aff3b0fc6a2bbdeabe866492dc7042083b7
tree8a28f46b97a9a2501308cc9e20d81d3384066d56
parent3bd664dc88ebecb9a91fc105f4ee62d11bb029df
parent18f0ffe58046217f1665a41cca18ead741a761b4
Merge tag 'v1.2.10' into develop

v1.2.10