merge stable into default

.hgtags

@@ -13,3 +13,5 @@ d2e13405b9d7144ee7ac920da7f4c30d99086bac cubicweb-forgotpwd-debian-version-0.3.0
 2436ae8273776e9897ba8abd8f475d814bc0636d cubicweb-forgotpwd-debian-version-0.4.0-1
 387dda6e118e4d7e42f3f3a89eeabf3d0135b876 cubicweb-forgotpwd-version-0.4.1
 d35e6fc61e169e165ac8c29e11d4273db50925ef cubicweb-forgotpwd-debian-version-0.4.1-1
+b1c4756396fe59a4bd2c90a0818fd310bbf9f2b9 cubicweb-forgotpwd-version-0.4.2
+0522d007625c8a34fd5a1538c60e60338400ecaf cubicweb-forgotpwd-debian-version-0.4.2-1

__pkginfo__.py

@@ -4,7 +4,7 @@
 modname = 'forgotpwd'
 distname = 'cubicweb-forgotpwd'
 
-numversion = (0, 4, 1)
+numversion = (0, 4, 2)
 version = '.'.join(str(num) for num in numversion)
 
 license = 'LGPL'

debian/changelog

+cubicweb-forgotpwd (0.4.2-1) unstable; urgency=low
+
+  * new upstream release
+
+ -- Sylvain Thénault <sylvain.thenault@logilab.fr>  Tue, 21 May 2013 14:29:31 +0200
+
 cubicweb-forgotpwd (0.4.1-1) unstable; urgency=low
 
   * new upstream release

views.py

@@ -166,7 +166,7 @@ class PasswordResetView(StartupView):
     __regid__ = 'pwdreset'
 
     def call(self):
-        self.wview('index', self.rset)
+        self.wview('index')
 
 
 # URL rewriting