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

[bojan]

commit 3c2cfa2e90777b6393ecfca01379919bb3ad703c
Merge: 36b3580 9aa14d4
Author: Bojan Smojver <bojan at rexursive.com>
Date:   Sat Jun 23 12:17:37 2012 +1000

    Merge branch 'master' into f16

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