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

[bojan]

commit faeba12e2e17435699c88a40abcbb696f042d442
Merge: c520a80 83cf257
Author: Bojan Smojver <bojan at rexursive.com>
Date:   Wed May 18 14:44:48 2011 +1000

    Merge branch 'master' into el6

 .gitignore  |    1 +
 sources     |    2 +-
 viewvc.spec |    5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)
---