[viewvc/el5: 5/5] Merge branch 'master' into el5

[bojan]

commit 7ae8717cd54f6bec945746e722d3441759d959a1
Merge: f77accb ac10a5f
Author: Bojan Smojver <bojan at rexursive.com>
Date:   Tue Jan 24 15:28:15 2012 +1100

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

 .gitignore  |    1 +
 sources     |    2 +-
 viewvc.spec |    5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc viewvc.spec
index 94f7d13,f79bfcb..f71620a
--- a/viewvc.spec
+++ b/viewvc.spec
@@@ -119,6 -119,12 +119,9 @@@ with decent performance when run under 
  %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc
  
  %changelog
+ * Tue Jan 24 2012 Bojan Smojver <bojan at rexursive.com> - 1.1.13-1
+ - bump up to 1.1.13
+ 
 -* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.12-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 -
  * Fri Nov  4 2011 Bojan Smojver <bojan at rexursive.com> - 1.1.12-1
  - bump up to 1.1.12