[httpd/f19: 6/6] Merge branch 'master' into f19

[Jan Kaluža]

commit 776697847b74da84a9f901a26c0e974dd5390d73
Merge: 0ee419b 0527022
Author: Jan Kaluza <jkaluza at redhat.com>
Date:   Wed Jul 31 08:42:13 2013 +0200

    Merge branch 'master' into f19

 .gitignore                                         |    1 +
 httpd-2.4.2-r1374214+.patch                        |   45 --
 httpd-2.4.4-aarch64.patch                          |  486 --------------------
 httpd-2.4.4-mod_cache-tmppath.patch                |   11 -
 httpd-2.4.4-mod_unique_id.patch                    |  239 ++++++++++
 httpd-2.4.4-r1476674.patch                         |  110 -----
 httpd-2.4.6-r1332643+.patch                        |  313 +++++++++++++
 ...iproxy.patch => httpd-2.4.6-sslmultiproxy.patch |   27 +-
 httpd.spec                                         |   33 +-
 sources                                            |    2 +-
 10 files changed, 585 insertions(+), 682 deletions(-)
---