[cherokee/el6] (2 commits) ...Merge branch 'master' into el6

[Pavel Lisý]

Summary of changes:

  4cf83c2... date correction in changelog (*)
  1a2124b... Merge branch 'master' into el6

(*) This commit already existed in another branch; no separate mail sent