Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer

2013-10-14 1139530fbf3fb0fdce1bf5cfee311cd6f0fbf816

interface/web/dns/dns_dkim_edit.php does not exist in tree 717dabdc679a30f162a4314fc908fbf8ce81866d