diff options
author | Ingela Anderton Andin <[email protected]> | 2011-09-21 15:40:32 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2011-09-21 15:40:32 +0200 |
commit | 4b300743a6035344ff3f8f74aee9fd218af8e953 (patch) | |
tree | 9a39aa1d0cddc6f33d016df8d2c14d9ea52c9681 /.mailmap | |
parent | a192733e4d2b4d74a1ce11bd75c9e59da8f41e0d (diff) | |
parent | 06b914798569d70e1ecd4769e95d9969fbce97da (diff) | |
download | otp-4b300743a6035344ff3f8f74aee9fd218af8e953.tar.gz otp-4b300743a6035344ff3f8f74aee9fd218af8e953.tar.bz2 otp-4b300743a6035344ff3f8f74aee9fd218af8e953.zip |
Merge remote branch 'upstream/dev' into major
* upstream/dev:
Prepare for release
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions