diff options
| author | Henrik Nord <[email protected]> | 2015-10-16 09:34:27 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2015-10-16 09:34:27 +0200 |
| commit | 5f73e439578c4356db26804f47e8b50901a8e45a (patch) | |
| tree | 96e56a7fe740a1d646c8a8fece77b9965a10196f /.mailmap | |
| parent | b51eab6da001dd53788d6c1a71ed18b56eeecf18 (diff) | |
| parent | ba49561cf3e2167acd5457de93b05e772f2fb16a (diff) | |
| download | otp-5f73e439578c4356db26804f47e8b50901a8e45a.tar.gz otp-5f73e439578c4356db26804f47e8b50901a8e45a.tar.bz2 otp-5f73e439578c4356db26804f47e8b50901a8e45a.zip | |
Merge branch 'maint'
Conflicts:
OTP_VERSION
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions