Merge branch 'train-2011.08.25' into dev

ChangeLog

@@ -14,7 +14,8 @@ train-2011.08.25:
   * minify include.js by default: #206
   * more than one email address can be added per dialog lifespan: #215
   * verifyier no longer verifies assertions issued by another server.
-
+  * (2011.08.31) no error message displayed if you try to authenticate with an invalid u/p: #222
+	
 train-2011.08.18:
   * upon clickthrough of the email link, don't have the browser window close itself: #162
   * passwords must be between 8 and 80 chars: #155