[cherokee/f15: 2/2] Merge branch 'master' into f15

[Pavel Lisý]

commit 881dedcb3bfa5da3e38493c4769d5eed8ad4e093
Merge: f828eb9 4cf83c2
Author: Pavel Lisý <pali at fedoraproject.org>
Date:   Tue Sep 13 12:22:37 2011 +0200

    Merge branch 'master' into f15

 cherokee.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---