[viewvc/f16: 3/3] Merge branch 'master' into f16

[bojan]

commit 4b5f7e538606ed1120de97755010135cfc9f74fd
Merge: cb348ea 4d10ab9
Author: Bojan Smojver <bojan at rexursive.com>
Date:   Sun Apr 29 18:25:10 2012 +1000

    Merge branch 'master' into f16

 README.httpd     |    9 ++++++-
 viewvc-fcgi.conf |    8 +++++++
 viewvc-wsgi.conf |    8 +++++++
 viewvc.conf      |   15 --------------
 viewvc.spec      |   58 ++++++++++++++++++++++++++++++++++++++++--------------
 5 files changed, 66 insertions(+), 32 deletions(-)
---