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