[apr-api-docs: 2/3] Merge branch 'master' of ssh://pkgs.fedoraproject.org/apr-api-docs

[bojan]

commit a4d8d6e76cba8983b319b9fa753cc10dfdf7426f
Merge: b4d9437 5390904
Author: Bojan Smojver <bojan at rexursive.com>
Date:   Sun Mar 4 18:18:15 2012 +1100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/apr-api-docs
    
    Conflicts:
    	apr-api-docs.spec

 apr-api-docs.spec |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
---
diff --cc apr-api-docs.spec
index 3ce69c8,7638005..2986084
--- a/apr-api-docs.spec
+++ b/apr-api-docs.spec
@@@ -1,6 -1,6 +1,11 @@@
  Name:           apr-api-docs
++<<<<<<< HEAD
 +Version:        1.4.6
 +Release:        1%{?dist}
++=======
+ Version:        1.4.5
+ Release:        2%{?dist}
++>>>>>>> 539090431a4eef14e267b042095d6d7153068e62
  Summary:        Apache Portable Runtime API documentation
  
  Group:          Development/Tools
@@@ -60,8 -60,8 +65,13 @@@ rm -rf $RPM_BUILD_ROO
  %doc %{_docdir}/apr-%{version}/api-docs/*
  
  %changelog
++<<<<<<< HEAD
 +* Sun Mar  4 2012 Bojan Smojver <bojan at rexursive.com> 1.4.6-1
 +- Bump up to 1.4.6
++=======
+ * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.5-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
++>>>>>>> 539090431a4eef14e267b042095d6d7153068e62
  
  * Sat May 21 2011 Bojan Smojver <bojan at rexursive.com> 1.4.5-1
  - Bump up to 1.4.5