SIGN IN SIGN UP

Merge pull request #2593 from dotcloud/2578

Fix mergeConfig with new ports
M
Michael Crosby committed
3f2a5912eecfd54713e3b54bbf79be6702f13f25