[viewvc/el6: 2/2] Merge branch 'master' into el6

[bojan]

commit 2835c8f1aa9394d62867d8abddd32c80f9987207
Merge: faeba12 1650126
Author: Bojan Smojver <bojan at rexursive.com>
Date:   Fri Jun 3 10:16:47 2011 +1000

    Merge branch 'master' into el6

 viewvc.spec |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)
---