Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
	classes/statusnet.ini

1 files changed, 5 insertions, 2 deletions

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 1be66fe5a..a6a93c405 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -93,14 +93,17 @@ border-radius:4px;
 -webkit-border-radius:4px;
 margin-bottom:18px;
 }
+
+.xoxo li {
+list-style-type:none;
+}
+
 form label.submit {
 display:none;
 }
-
 .form_settings {
 clear:both;
 }
-
 .form_settings fieldset {
 margin-bottom:29px;
 }