diff options
| author | Micael Karlberg <[email protected]> | 2011-04-19 13:46:09 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-04-19 13:46:09 +0200 |
| commit | 495ed95eeda4aa37de2f7387a3f029eb907039d6 (patch) | |
| tree | 3fe3cb4448f1a31af00d700bd94780d8afca41a0 /.mailmap | |
| parent | cddd6988812ae2a6e696db2f49fba5b0eee4d570 (diff) | |
| parent | 29d4a0f745b69f7d2a75664b857b6ad65fca920d (diff) | |
| download | otp-495ed95eeda4aa37de2f7387a3f029eb907039d6.tar.gz otp-495ed95eeda4aa37de2f7387a3f029eb907039d6.tar.bz2 otp-495ed95eeda4aa37de2f7387a3f029eb907039d6.zip | |
Merge branch 'bmk/inets/default_ssl/OTP-9230' into bmk/inets/inet56_integration
OTP-9230
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions