commit | f24cc7b0928b9bfbfa37e9573512e6c8acc7c349 | [log] [tgz] |
---|---|---|
author | Luca Milanesio <luca.milanesio@gmail.com> | Mon Jun 01 16:25:57 2015 +0100 |
committer | Luca Milanesio <luca.milanesio@gmail.com> | Mon Jun 01 16:26:46 2015 +0100 |
tree | 4c6e2573682dba10be2a16ccf1cab70da58c90e7 | |
parent | ff454a69efb6767b01248198dd1d8ffe1b44bd99 [diff] | |
parent | 6f7ed2abb49a3619c78b73af9b0a4b1e05545ec4 [diff] |
Merge branch 'stable-2.11' * stable-2.11 Do not overwrite HTTP auth configuration settings NOTE: The change was already in master and cherry-picked to stable-2.11 Merging from stable-2.11 just to update the tracking on Git Change-Id: Ie972904371e871005ec683ce40439ead673771ab