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

[bojan]

commit 36b358012aa8edc4bccbb7aae9c5227ba36817ca
Merge: 4b5f7e5 1694288
Author: Bojan Smojver <bojan at rexursive.com>
Date:   Wed Jun 13 08:04:32 2012 +1000

    Merge branch 'master' into f16

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