[apr] 01/03: Merge temporary branch with 1.4.8-3 / #730196

[Stefan Fritsch]

This is an automated email from the git hooks/post-receive script.

sf pushed a commit to annotated tag debian/1.5.0-1
in repository apr.

commit d92f4647f3bc8c63ac158d9e391505494ff25486
Merge: 9cb2b06 4307e2e
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sat Nov 23 01:09:42 2013 +0100

    Merge temporary branch with 1.4.8-3 / #730196
    
    Conflicts:
    	debian/changelog

 debian/changelog | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index a1bf094,b15db1e..a460089
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,5 +1,11 @@@
 +apr (1.5.0-1) UNRELEASED; urgency=low
 +
 +  * New upstream version
++
++ -- Stefan Fritsch <sf at debian.org>  Sat, 16 Nov 2013 18:31:00 +0100
++
+ apr (1.4.8-3) unstable; urgency=low
+ 
    * Re-add the logic to force use of bash for configure/libtool. Otherwise,
      if the package is build with /bin/sh -> /bin/bash, the shipped libtool
      won't work on systems with /bin/sh -> /bin/dash. This got lost in

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apr.git