[subversion-api-docs/f14/master: 5/5] Merge branch 'master' into f14

[bojan]

commit 1936fd73f71e468b3327faefa18951d9c94ca254
Merge: ee67752 8d9d0b2
Author: Bojan Smojver <bojan at rexursive.com>
Date:   Mon Mar 7 12:36:44 2011 +1100

    Merge branch 'master' into f14
    
    Conflicts:
    	subversion-api-docs.spec

 subversion-api-docs.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc subversion-api-docs.spec
index 9cad692,e99a8d6..85581a2
--- a/subversion-api-docs.spec
+++ b/subversion-api-docs.spec
@@@ -52,10 -52,16 +52,13 @@@ rm -rf $RPM_BUILD_ROO
  %doc %{_docdir}/subversion-%{version}/api-docs/*
  
  %changelog
+ * Mon Mar  7 2011 Bojan Smojver <bojan at rexursive.com> 1.6.16-1
+ - bump up to 1.6.16
+ 
 -* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.15-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 -
 -* Mon Dec  6 2010 Bojan Smojver <bojan at rexursive.com> 1.6.15-1
 +* Mon Jan 10 2011 Bojan Smojver <bojan at rexursive.com> 1.6.15-1
  - bump up to 1.6.15
  
 -* Thu Oct  7 2010 Bojan Smojver <bojan at rexursive.com> 1.6.13-1
 +* Mon Oct 11 2010 Bojan Smojver <bojan at rexursive.com> 1.6.13-1
  - bump up to 1.6.13
  
  * Mon Jul 19 2010 Bojan Smojver <bojan at rexursive.com> 1.6.12-1