Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index b698ff922136f3e5bc064de6c9846841d4f6a0db..f5638e58ab369017aa2b21198eb21a7bbd820558 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1511,6 +1511,10 @@ font-size:150%;
     min-height: 0;
 }
 
+#content .notice-source-system .notice div.entry-title {
+    font-style: normal;
+}
+
 span.rtl {
     display: block;
     direction: rtl;

diff --git a/theme/base/images/lock.png b/theme/base/images/lock.png
deleted file mode 100644 (file)
index 2ebc4f6..0000000
Binary files a/theme/base/images/lock.png and /dev/null differ

diff --git a/theme/base/images/lock_open.png b/theme/base/images/lock_open.png
deleted file mode 100644 (file)
index a471765..0000000
Binary files a/theme/base/images/lock_open.png and /dev/null differ