Merge remote branch 'upstream/master'

This commit is contained in:
Michael Vogel 2012-08-02 00:20:44 +02:00
commit 47396b1d28
145 changed files with 8731 additions and 14229 deletions

View file

@ -209,7 +209,7 @@ function twitter_settings(&$a,&$s) {
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="twitter-submit" class="settings-submit" value="' . t('Submit') . '" /></div>';
}
}
$s .= '</div><div class="clear"></div></div>';
$s .= '</div><div class="clear"></div>';
}