[master] Finished merge of trac4088 (client classification expression parser)

diff --git a/ChangeLog b/ChangeLog
index 1ac4d833ae3fa5b7f4c9173c1f9fe25045932350..955eff9be4602d7e5eaa4cc04682c719b21e4b6b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1048.  [func]          fdupont,tomek
+       Implement expression parser for client classification.
+       (Trac #4088, git xxx)
+
 1047.  [func]*         stephen
        Change the way that hooks libraries are defined in the configuration
        file in preparation for allowing the specification of library-specific