[apr-util] 02/03: Merge branch 'upstream'

[Stefan Fritsch]

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

sf pushed a commit to branch master
in repository apr-util.

commit a1b218ec4196152bd64957414021f66c256094db
Merge: 687f66c 213e6d9
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Mon Sep 22 23:03:35 2014 +0200

    Merge branch 'upstream'

 CHANGES                          |  26 ++++++
 CMakeLists.txt                   |  20 ++---
 NOTICE                           |   4 +-
 README.cmake                     |   2 +
 apr-util.spec                    |   2 +-
 build/config.guess               | 184 +++++----------------------------------
 build/config.sub                 |   6 +-
 build/dbm.m4                     |  31 +++++--
 configure                        |  63 +++++++++-----
 crypto/apr_crypto.c              |   2 +-
 crypto/apr_passwd.c              |  10 ++-
 dbd/apr_dbd_mysql.c              |   4 +-
 dbd/apr_dbd_odbc.c               |  35 +++++---
 dbm/NWGNUmakefile                |   2 +-
 include/apu_version.h            |   4 +-
 test/Makefile.win                |   2 +
 xml/expat/conftools/config.guess | 184 +++++----------------------------------
 xml/expat/conftools/config.sub   |   6 +-
 18 files changed, 195 insertions(+), 392 deletions(-)

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