--- trunk/ChangeLog	2011/02/23 14:51:39	441
+++ trunk/ChangeLog	2011/03/14 09:50:50	443
@@ -1,3 +1,14 @@
+2011-03-14  Roland Geider  <roland.geider@intevation.de>
+
+	* formed/formed/plugins/export/xsd.py,
+	  formed/formed/config.py: Generate correct XSD if there are
+	  conditionals in Choices. Also deactivate the webserver nobody is
+	  using.
+
+2011-03-08  Roland Geider  <roland.geider@intevation.de>
+
+	* formed/formed/plugins/export/xsd.py: Updated XSD
+
 2011-02-23  Bernhard Herzog  <bh@intevation.de>
 
 	Port new RepeatNode attributes "orderby" and "reverse" from libformed