Merge branch 'hotfix/2.1.13' v2.1.13
authorLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 21:51:50 +0000 (17:51 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 21:51:50 +0000 (17:51 -0400)
commit8a41f386ca8f6a0b90f5d57b16ee4e978c478500
tree54cbb95a990a43004c56789c9d4b09c264f2afc4
parent273f5c7497c2bd80d25c4a57cadbe117fdb38f57
parent92174f9dac6aa62d41e0929f0d916a0fb052bbdc
Merge branch 'hotfix/2.1.13'