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

[bojan]

commit baf348690a3d28353e685af9ff843995ae8e5921
Merge: a7f7f83 83cf257
Author: Bojan Smojver <bojan at rexursive.com>
Date:   Wed May 18 14:51:28 2011 +1000

    Merge branch 'master' into f13

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