[viewvc/f13/master: 2/2] Fix merge conflicts.

[bojan]

commit a7f7f839b7525865fda3daab0b1017063bec14a7
Merge: 93c8f67 33a6c02
Author: Bojan Smojver <bojan at rexursive.com>
Date:   Wed Mar 16 13:18:29 2011 +1100

    Fix merge conflicts.

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