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

[bojan]

commit 93c8f67b784a1e42acfdb8c2f07bce98eb3b63b0
Merge: 39f2acc 8011355
Author: Bojan Smojver <bojan at rexursive.com>
Date:   Mon Feb 21 11:04:23 2011 +1100

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	sources
    	viewvc.spec

 .gitignore  |    1 -
 sources     |    2 +-
 viewvc.spec |    8 +++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)
---
diff --cc viewvc.spec
index ad7b382,87e9189..3744899
--- a/viewvc.spec
+++ b/viewvc.spec
@@@ -118,6 -118,12 +118,9 @@@ with decent performance when run under 
  %config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf
  
  %changelog
+ * Mon Feb 21 2011 Bojan Smojver <bojan at rexursive.com> - 1.1.9-1
+ - bump up to 1.1.9
+ 
 -* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.8-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 -
  * Mon Dec  6 2010 Bojan Smojver <bojan at rexursive.com> - 1.1.8-1
  - bump up to 1.1.8