[gitweb-caching/el5/master: 6/6] Merge branch 'master' into el5

Fri Jul 30 21:23:56 UTC 2010

commit 79686602ba9029a638e4a89a651ff0f16284728f
Merge: 506739f 8823f73
Author: John 'Warthog9' Hawley <warthog9 at eaglescrag.net>
Date:   Fri Jul 30 14:18:15 2010 -0700

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	gitweb-caching.spec
    	sources
    
    all resolved - John 'Warthog9' Hawley

 .gitignore                                         |    2 +-
 ...a7869936599175d70a903e1a9adeacd62c04.tar.gz.asc |    7 +++++++
 gitweb-caching.spec                                |   13 ++++++++++---
 sources                                            |    2 +-
 4 files changed, 19 insertions(+), 5 deletions(-)
---