[viewvc/el6: 7/7] Merge branch 'f15' into el6

[bojan]

commit 41c73633669798e97a13057ff4d368baf442442c
Merge: f71f800 84cf1eb
Author: Bojan Smojver <bojan at rexursive.com>
Date:   Tue Jan 24 15:16:15 2012 +1100

    Merge branch 'f15' into el6
    
    Conflicts:
    	.gitignore
    	sources
    	viewvc.spec

 .gitignore  |    1 +
 sources     |    2 +-
 viewvc.spec |    5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc viewvc.spec
index 5474444,ef51bd9..1aad3d4
--- a/viewvc.spec
+++ b/viewvc.spec
@@@ -118,6 -118,12 +118,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 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