aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-05-12 14:08:33 +0200
committerMicael Karlberg <[email protected]>2011-05-12 14:08:33 +0200
commit9f1bd481611ad0ad9e4913b66adde474dafafa98 (patch)
treecf516c356a47991f1f7f136e0306c9812e738fff /.mailmap
parent8a6b5ba7e038decf54e044656ef05ce9eec3c6dd (diff)
parentd3d5b4fcf3e07c22e61c2c9a410d365178b12945 (diff)
downloadotp-9f1bd481611ad0ad9e4913b66adde474dafafa98.tar.gz
otp-9f1bd481611ad0ad9e4913b66adde474dafafa98.tar.bz2
otp-9f1bd481611ad0ad9e4913b66adde474dafafa98.zip
Merge branch 'bmk/catching_gen_tcp_badargs/OTP-9289' into bmk/inets/inet56_integration
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions