Merge remote-tracking branch 'ispc/master'

Marius Cramer

2014-08-13 f382f091aa97d10056b4c433aa55298fece010d4

1
ALTER TABLE  `web_domain` ADD  `ipv6_address` VARCHAR( 255 ) default NULL AFTER  `ip_address`;