Merge branch 'testing'

Conflicts:
	theme/base/css/display.css

diff --cc theme/base/css/display.css
index 7eff4709c7b0a9f14f83c7d2fe65fb922c8d6c3c,65dd159900e224426d6338916e615457eaa36105..fb74b1d0b0f36dc1856f31dc8f1e879f80544f37
--- 1/theme/base/css/display.css
--- 2/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@@ -984,12 -1039,13 +1039,17 @@@ overflow:visible
  #showstream .notice div.entry-content {
  margin-left:0;
  }
 +#shownotice .notice .entry-title,
 +#shownotice .notice div.entry-content {
 +margin-left:110px;
 +}
  #shownotice .notice .entry-title {
+ margin-left:110px;
  font-size:2.2em;
+ min-height:123px;
+ }
+ #shownotice .notice div.entry-content {
+ margin-left:0;
  }
  
  .notice p.entry-content {