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

[bojan]

commit e19ada78c7ed19bb7fc1897220760e66c796ea4e
Merge: 3206fb5 1650126
Author: Bojan Smojver <bojan at rexursive.com>
Date:   Fri Jun 3 10:11:05 2011 +1000

    Merge branch 'master' into f14

 viewvc.spec |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)
---