diff options
author | Rickard Green <[email protected]> | 2014-10-23 10:48:05 +0200 |
---|---|---|
committer | Rickard Green <[email protected]> | 2014-10-23 10:48:05 +0200 |
commit | f5fab7691de210fec10e5c5d9db67710958797a3 (patch) | |
tree | acf5a93ac8f13d386fb0992c0e313a03b8c10c82 /.mailmap | |
parent | c22c20d0c3442b264a195f26606f8e6cd40dbd08 (diff) | |
parent | e97f9bc1672cb2d2c07d4133030528b43b26532c (diff) | |
download | otp-f5fab7691de210fec10e5c5d9db67710958797a3.tar.gz otp-f5fab7691de210fec10e5c5d9db67710958797a3.tar.bz2 otp-f5fab7691de210fec10e5c5d9db67710958797a3.zip |
Merge branch 'maint'
* maint:
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions