[viewvc/f15: 3/3] Merge branch 'master' into f15

[bojan]

commit 84cf1eb2a31c1873066e81d96fdad87de4914d23
Merge: 9dd1d53 ac10a5f
Author: Bojan Smojver <bojan at rexursive.com>
Date:   Tue Jan 24 15:01:58 2012 +1100

    Merge branch 'master' into f15
    
    Conflicts:
    	viewvc.spec

 .gitignore  |    1 +
 sources     |    2 +-
 viewvc.spec |    7 +++++--
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --cc viewvc.spec
index 1c8dd89,f79bfcb..ef51bd9
--- a/viewvc.spec
+++ b/viewvc.spec
@@@ -118,8 -119,11 +118,11 @@@ 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
 +* Sat Dec  3 2011 Bojan Smojver <bojan at rexursive.com> - 1.1.12-2
 +- don't require subversion-python
  
  * Fri Nov  4 2011 Bojan Smojver <bojan at rexursive.com> - 1.1.12-1
  - bump up to 1.1.12