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

[Pavel Lisý]

Summary of changes:

  4cf83c2... date correction in changelog (*)
  881dedc... Merge branch 'master' into f15

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