aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2012-01-12 14:36:25 +0100
committerMicael Karlberg <[email protected]>2012-01-12 14:36:25 +0100
commitfdf31ed028c3cf27387debd1efff3f1e649cd451 (patch)
treebde23761a1b92b6da29f8fa51abaee2c4700a5db /.mailmap
parentc634c9c5f022c7f8ba91e1ef9d8fede838153f3a (diff)
parent40f968c06136e6268575daab02cfd6bd26f95fc6 (diff)
downloadotp-fdf31ed028c3cf27387debd1efff3f1e649cd451.tar.gz
otp-fdf31ed028c3cf27387debd1efff3f1e649cd451.tar.bz2
otp-fdf31ed028c3cf27387debd1efff3f1e649cd451.zip
Merge branch 'bmk/snmp/agent/synchronizing_vacm_dumping/r14/OTP-9851' into bmk/snmp/snmp4215_integration/r14
Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/src/app/snmp.appup.src
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions