Fixed syntax appup ssh
Merge branch 'fredrik/ssh/appup-r15b03-patch' into maint-r15

* fredrik/ssh/appup-r15b03-patch:
  Fixed syntax appup ssh
  Teach Win installer to handle redist on w2012/w8
Prepare release
Reverse swapped arguments

The fault caused a handle_request callback to fail whenever an eval
tuple was returned. Introduced in commit f24adb28.
Add a testcase
Traffic suite comments plus a minor match tweak
Update appup
vsn -> 1.3.1
Merge branch 'anders/diameter/eval_clause/OTP-10685' into maint-r15

* anders/diameter/eval_clause/OTP-10685:
  vsn -> 1.3.1
  Update appup
  Traffic suite comments plus a minor match tweak
  Add a testcase
  Reverse swapped arguments
Update release notes
global_SUITE: Eliminate redundant registration of 'test_server' process

global_SUITE registers the name 'test_server' in the global registry
for what seems to be only historical reasons. Exactly how it happened
is lost in the mists of time, but I think the following is a reasonable
reconstruction:

* At one point in time, the test_server application started to do
  a global registration of a 'test_server' process to support
  embedded systems when the test_server application was run on both a
  host and a target system.

* global_SUITE had to be modified to take the pre-existing
  'test_server' registration into account.

* When Erlang/OTP switched to using common_test, global_SUITE was
  modified to register the 'test_server' name itself in commit
  8bd07f450816eaaae52d28740d89ead1f930cd02 (since the test_server
  application does not register the 'test_server' name when run
  under control of common_test).

To slightly reduce the size of global_SUITE, remove the redundant
registration and stop expecting 'test_server' to be registered.
Merge branch 'bjorn/kernel/global_SUITE'

* bjorn/kernel/global_SUITE:
  global_SUITE: Eliminate redundant registration of 'test_server' process
Merge branch 'maint-r15'
Merge tag 'build/maint-r15/2013-01-14_20.31' into maint-r15
Merge branch 'maint-r15'

Conflicts:
	erts/vsn.mk
inets - httpc_SUITE: add redirect tests for response 303

httpc contains code for redirecting http response
301, 302, 303, and 307, but no tests existed for
response '303 See Other'. Added tests (get, head, and post)
for 303 and renumbered tests for 307. The subtle thing is that
for 303 also post requests *should* be redirected.

Also added the necessary 303 page to the dummy_server.
inets: fix autoredirect for POST requests responding 303

Changed httpc_response, for redirect '303 See Other' also POST
requests should be redirected (using GET). See RFC2616 sect. 10.3.4
for clarification.
Merge branch 'dg/win_icon' into master-pu
Merge branch 'fdm/windows_file_share_delete' into master-pu
Merge branch 'lf/snmp-tuple-fun' into master-pu