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

2 files changed, 0 insertions, 3 deletions

diff --git a/plugins/UserFlag/flag.gif b/plugins/UserFlag/flag.gif
new file mode 100644
index 000000000..68c8aee25
--- /dev/null
+++ b/plugins/UserFlag/flag.gif
diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css
index 84bc1b1d6..4e50aadbe 100644
--- a/theme/base/css/ie.css
+++ b/theme/base/css/ie.css
@@ -27,11 +27,8 @@ padding:0 4px;
 }
 .notice-options input.submit {
 font-size:0;
-margin-top:3px;
-height:16px;
 text-align:right;
 text-indent:0;
-width:24px;
 }
 .notice div.entry-content .timestamp a {
 margin-right:4px;