diff options
| author | Hans Nilsson <[email protected]> | 2014-11-28 14:44:49 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2014-11-28 14:44:49 +0100 |
| commit | eac865b040ba663bf9635ca800097acb8bc91c98 (patch) | |
| tree | e19e54c5fd95d33c5aff693cabf5bcffab4f692d /.gitattributes | |
| parent | 1a3b8025c61a82debd36739d2c6ab4102f4bb9a8 (diff) | |
| parent | 948c140f207fdae5016780229a8ad803aa80e372 (diff) | |
| download | otp-eac865b040ba663bf9635ca800097acb8bc91c98.tar.gz otp-eac865b040ba663bf9635ca800097acb8bc91c98.tar.bz2 otp-eac865b040ba663bf9635ca800097acb8bc91c98.zip | |
Merge branch 'maint'
* maint:
eldap: Fix timeout missing in ssl:connect
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions