commit c0045e1c4f0f0c1f16e175f6ac3979e11561ac74
author Valentin Valchev <vvalchev@apache.org> Tue Dec 16 09:40:05 2014 +0000
committer Valentin Valchev <vvalchev@apache.org> Tue Dec 16 09:40:05 2014 +0000
tree a98dacb5f9690b4b2904528293c7e135474d4d25
parent 3c06da88710381f0a7c36b5200146605b39939ef

updated the changelog with some last-minute changes for release 1.0.4

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1645890 13f79535-47bb-0310-9956-ffa450edef68

webconsole-plugins/upnp/changelog.txt

diff --git a/webconsole-plugins/upnp/changelog.txt b/webconsole-plugins/upnp/changelog.txt
index e63cf59..071a0f1 100755
--- a/webconsole-plugins/upnp/changelog.txt
+++ b/webconsole-plugins/upnp/changelog.txt
@@ -9,6 +9,7 @@
     * [FELIX-4013] - Incorrect usage of ServiceTracker.size() in UPnP Plugin
     * [FELIX-4032] - UPnP Plugin small refactoring
     * [FELIX-4560] - Unsynchonized access to map can cause infinite loop in UPnP web console plugin
+    * [FELIX-4733] - UPnP plugin native2ascii plugin conflicts with Eclipse m2e
 
 ** Improvement
     * [FELIX-3861] - Set felix.webconsole.category on Web Console plugins