[master] Merge branch 'master' of ssh://git.kea.isc.org/git/kea

# Conflicts:
#	ChangeLog

diff --cc ChangeLog
index a8921b0f0aa0823150db3850d0007fa75a56cdb8,1a31c1728f85b0ebd8fdc94a606f101fd7fb57d1..62480be32a02cf7be124444abcbfa6797e82db81
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,9 +1,15 @@@
- 1213. [func]          tomek
++1214. [func]          tomek
 +      Bison parser implemented for Control-agent. The code is able
 +      to syntactically parse input configuration, but the output
 +      is not used yet.
 +      (Trac #5076, git d99048aa5b90efa7812a75cdae98a0913470f5a6)
 +
+ 1213. [bug]           fdupont
+       Option string values containing comma can now be specified
+       correctly by preceding comma with double backslashes (e.g.
+       "foo\\,bar").
+       (Trac #5105, git fa79ac2396aa94d7bac91bd12d3593ebaaa9386d)
+ 
  1212. [doc]           andreipavelQ
        Many spelling corrections.
        (Github #47, git a6a7ca1ced8c63c1e11ef4c572f09272340afdd7)