aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2012-03-27 17:57:07 +0200
committerPeter Andersson <[email protected]>2012-03-27 17:57:07 +0200
commitefee6d37c1ce665c535a45acb8ee03bce55d1e67 (patch)
tree7eba9c85ba9947a74f1a81e870a0c3424c1e51d3 /.mailmap
parentff53cc179325d1f1aececf357672e7abb9e7d024 (diff)
parent0ec49ecd7b6acf95329aaafa1bc0796d0f41cc66 (diff)
downloadotp-efee6d37c1ce665c535a45acb8ee03bce55d1e67.tar.gz
otp-efee6d37c1ce665c535a45acb8ee03bce55d1e67.tar.bz2
otp-efee6d37c1ce665c535a45acb8ee03bce55d1e67.zip
Merge remote branch 'origin/peppe/common_test/otp-10021' into maint
* origin/peppe/common_test/otp-10021: Increase test margin for user timetraps
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions