[Rt-commit] rt branch, 4.0-trunk, updated. rt-4.0.8-84-gfa8cdbe

[Alex Vandiver]

The branch, 4.0-trunk has been updated
       via  fa8cdbe6010101861e8d6059bd1e955945b6ea52 (commit)
       via  1b39bc1cc7450220d2648ebf8f0d95e136730228 (commit)
       via  fafc139961f7a064950bcda627e6a2afe05f087e (commit)
      from  7ff6b7ddbd6946d6869eba0428a1eb790db3dcfc (commit)

Summary of changes:
 share/html/NoAuth/css/base/forms.css |  7 ++++++
 share/html/User/Prefs.html           | 47 +++++++++++++++++++++---------------
 2 files changed, 35 insertions(+), 19 deletions(-)

- Log -----------------------------------------------------------------
commit fa8cdbe6010101861e8d6059bd1e955945b6ea52
Merge: 7ff6b7d 1b39bc1
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri Nov 2 12:41:03 2012 -0400

    Merge branch '4.0/auth-token-reset' into 4.0-trunk

diff --cc share/html/NoAuth/css/base/forms.css
index 19af1b2,e2468fd..e2468fd
mode 100644,100755..100644
--- a/share/html/NoAuth/css/base/forms.css
+++ b/share/html/NoAuth/css/base/forms.css
diff --cc share/html/User/Prefs.html
index a42ece5,5595f23..5595f23
mode 100644,100755..100644
--- a/share/html/User/Prefs.html
+++ b/share/html/User/Prefs.html

-----------------------------------------------------------------------