Merge branch 'bash' into 'master'

Marius Cramer

2015-06-05 1fa1bcead3a1fc02c1ff81732ce0e561df64822b

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