Merge remote-tracking branch 'florian030/master'

Marius Cramer

2014-04-10 58964a90d06f523f991a67bd1068e1f504d1f8a9

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