# HG changeset patch
# User bsw
# Date 1337628658 -7200
# Node ID c92e2f2dcc2e6086dbbf7f911dc402b8b8b4786e
# Parent  5ca9de94cb1317d9ecea8c1a11cd425bbf7aebae# Parent  69c241bb92f8b002b06fb7bcd3dbc7666b0d998e
merge

diff -r 5ca9de94cb13 -r c92e2f2dcc2e .hgtags
--- a/.hgtags	Sun May 20 19:43:01 2012 +0200
+++ b/.hgtags	Mon May 21 21:30:58 2012 +0200
@@ -38,6 +38,7 @@
 bfd8d88f72fcb511bc20126805a4a92d10c7ea7f beta31
 bf735d8095aa237e0283305fc0c37527572248e7 beta32
 4905d7d79486cee780b715a90dcd643e936b6a7a beta33
+55939cbde1a5d318c3342fabee841748cc3d7886 beta34
 74f768a162e1d941158bde5a3e42bb8a71af5090 v2.beta1
 371e690018ea59317682bce44e7b3c33c70d129a v2.beta2
 3e9457cfc6b195fc72760b5b22981e2e7b9c84d8 v2.beta3
diff -r 5ca9de94cb13 -r c92e2f2dcc2e config/default.lua
diff -r 5ca9de94cb13 -r c92e2f2dcc2e model/member.lua
--- a/model/member.lua	Sun May 20 19:43:01 2012 +0200
+++ b/model/member.lua	Mon May 21 21:30:58 2012 +0200
@@ -497,4 +497,4 @@
   end
   selector:optional_object_mode()
   return selector:exec()
-end
\ No newline at end of file
+end