diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-04-15 11:37:00 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-04-15 11:37:00 +0200 |
| commit | 23906a01725f4494b8816c242926d08aeca0ef67 (patch) | |
| tree | 9b1821578103320c1b029000f4f46fece35ea2d4 /erts/emulator | |
| parent | 344c8180c2f8197056b384b136520deef9049a1a (diff) | |
| parent | 4440046af48660ecb8d59d6a241c2aea55fc874a (diff) | |
| download | otp-23906a01725f4494b8816c242926d08aeca0ef67.tar.gz otp-23906a01725f4494b8816c242926d08aeca0ef67.tar.bz2 otp-23906a01725f4494b8816c242926d08aeca0ef67.zip | |
Merge branch 'ia/ssl/prepare-for-release' into dev
* ia/ssl/prepare-for-release:
Prepare for release
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions