From 42453c1600bd93ed21532918d49c199b6fabca30 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 7 May 2014 09:41:54 -0700
Subject: [PATCH] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c53b29787..4928c948c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@ BUG FIXES:
 
   - core: Global control works from directories that don't have a
       Vagrantfile.
+  - core: Plugins that define config methods that collide with Ruby Kernel/Object
+  -   methods are merged properly. [GH-3670]
   - commands/package: `--base` works without crashing for VirtualBox.
   - commands/reload: If `--provision` is specified, force provisioning. [GH-3657]
   - guests/redhat: Fix networking issues with CentOS. [GH-3649]