Merge branch 'stable-3.0.5' into 'stable-3.0.5'

Till Brehm

2015-09-18 c108c22cb139b55e3adb7e563ab640c4dc8d2305

1
ALTER TABLE  `web_domain` DROP INDEX `serverdomain`, ADD UNIQUE  `serverdomain` (  `server_id` , `ip_address`, `domain` );