commit 2d0282e3eb4b95f62e772c255109c0d8c835b2b6 Merge: 8705c5c afbdddc Author: Pavel Lisý <pali at fedoraproject.org> Date: Mon Oct 10 16:53:46 2011 +0200 Merge branch 'master' into f14 .gitignore | 1 + cherokee.spec | 36 +++++++++++++++++++++--------------- sources | 3 +-- 3 files changed, 23 insertions(+), 17 deletions(-) ---