Merge tag 'v2.1.12' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 21:48:24 +0000 (17:48 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 21:48:24 +0000 (17:48 -0400)
commit3ff9a4e20a50b3bd7256963a09983f1c395a4d67
tree718665f259a6e419f3c927f9877bc8549ee7bb9a
parent15501586dc75710ad7560c1dd5bfbf13dbf6480f
parent273f5c7497c2bd80d25c4a57cadbe117fdb38f57
Merge tag 'v2.1.12' into develop

v2.1.12