Merge from HEAD

diff --git a/doc/devel/todo b/doc/devel/todo
index 91f8e9f3182f61b303b6e0933039b687ab4aa32f..97f6563cde78a8e8f755d87a5bac4ad8b24c691c 100644 (file)
--- a/doc/devel/todo
+++ b/doc/devel/todo
@@ -32,7 +32,6 @@ Large projects
 --------------
 Implement character string localization 
 Implement X.500 administrative models (e.g. subentries (RFC 3672), etc.)
-Implement LDAP component matching (RFC 3687)
 Implement LDAP sorted search results control (RFC 2891)
 
 
@@ -50,6 +49,7 @@ Localize tools
 
 Small projects
 --------------
+Add LDIFv2 (XML) support to command line tools
 Implement LDAPprep and SASLprep
 Implement additional matching rules (RFC 3698)
 Add dumpasn1 logging support