[lighttpd/f19: 3/3] Merge branch 'f20' into f19

Wed Mar 12 17:05:56 UTC 2014

commit ec4d7cb6a2d0d527da0eab0787f5620a6670a04b
Merge: ab49af3 f9041ff
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Wed Mar 12 12:03:07 2014 -0500

    Merge branch 'f20' into f19
    
    Conflicts:
    	lighttpd.spec

 .gitignore    |    1 +
 lighttpd.spec |    9 ++++++---
 sources       |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
---