diff options
author | Erlang/OTP <[email protected]> | 2013-04-16 20:14:58 +0200 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2013-04-16 20:14:58 +0200 |
commit | 53a6a6e5741627b2af2c9fbe631d0da7146606cd (patch) | |
tree | 5bea54d2fc9dc17de04413362ba9ccbf0e004fdb /.mailmap | |
parent | 7b31cdb80624567568474d79bff07e053457a450 (diff) | |
parent | f7c7510b55efe6a1ab1133f47ec4c3b0371784e8 (diff) | |
download | otp-53a6a6e5741627b2af2c9fbe631d0da7146606cd.tar.gz otp-53a6a6e5741627b2af2c9fbe631d0da7146606cd.tar.bz2 otp-53a6a6e5741627b2af2c9fbe631d0da7146606cd.zip |
Merge branch 'bjorn/asn1/fix-lost-extension-mark/OTP-10995' into maint-r16
* bjorn/asn1/fix-lost-extension-mark/OTP-10995:
Prevent loss of objects after the extension marker
Don't lose the extension mark for object set parameters
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions