Merge branch 'uiredesign' of ../evan into uiredesign

diff --cc actions/login.php
index 5226458fb0f447d1373fd9cebaecb93dc99b632c,cd337bd3956f38f087fbcf43b3c6bc88a3c20e1e..7ae1ed41dde55456f6e73f02b454c1bd834fe21c
--- 1/actions/login.php
--- 2/actions/login.php
+++ b/actions/login.php
@@@ -120,9 -120,11 +120,9 @@@ class LoginAction extends Actio
          if ($this->error) {
              $this->element('p', 'error', $this->error);
          } else {
-             $instr = $this->get_instructions();
+             $instr = $this->getInstructions();
              $output = common_markup_to_html($instr);
 -          $this->elementStart('div', 'instructions');
              $this->raw($output);
 -            $this->elementEnd('div');
          }
      }
      

diff --cc lib/action.php
Simple merge