Merge branch 'master' of gitorious.org:statusnet/mainline

* 'master' of gitorious.org:statusnet/mainline:
  Show aside primary on settings pages for all themes.
  correct error in README on default for deletion

README

@@ -1279,7 +1279,7 @@ biolimit: max character length of bio; 0 means no limit; null means to use
 backup: whether users can backup their own profiles. Defaults to true.
 restore: whether users can restore their profiles from backup files. Defaults
 	 to true.
-delete: whether users can delete their own accounts. Defaults to true.
+delete: whether users can delete their own accounts. Defaults to false.
 move: whether users can move their accounts to another server. Defaults
       to true.	 
 

plugins/NewMenu/newmenu.css

@@ -41,7 +41,12 @@ border-radius-topright:7px;
 border-radius-topright:0;
 -moz-border-radius-topright:0;
 -webkit-border-top-right-radius:0;
+min-height: 360px;
 }
 body[id$=settings] #aside_primary {
-display:none;
+float: right;
+width: 17.25%;
+margin-right: 10.45%;
+margin-top: 6px;
+min-height: 0px;
 }