diff options
| author | Henrik Nord <[email protected]> | 2012-08-29 16:16:26 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2012-08-29 16:16:26 +0200 |
| commit | 5a68678e673e3dfe5c24fa0495fbf61743c416a9 (patch) | |
| tree | c8a30b6b88c549db0a0c69d524c1ea2463719090 | |
| parent | 0f89d26db03c7db52e49c75b238438b79684872f (diff) | |
| parent | bb1747c07f559f0563f37b4606cbfc5a1612db08 (diff) | |
| download | otp-5a68678e673e3dfe5c24fa0495fbf61743c416a9.tar.gz otp-5a68678e673e3dfe5c24fa0495fbf61743c416a9.tar.bz2 otp-5a68678e673e3dfe5c24fa0495fbf61743c416a9.zip | |
Merge branch 'maint'
Conflicts:
README.md
| -rw-r--r-- | README.md | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -73,6 +73,6 @@ Copyright and License [1]: http://www.erlang.org [2]: http://wiki.github.com/erlang/otp/submitting-patches - [3]: http://www.erlang.org/faq/faq.html + [3]: http://www.erlang.org/static/doc/mailinglist.html [4]: http://erlang.github.com/otp/ [5]: HOWTO/INSTALL.md |