# HG changeset patch
# User jbe
# Date 1337648834 -7200
# Node ID 346eb72a2a6adc45908d7c27bcc2efdd5faf6baf
# Parent  3e4f6534bb151d8e5b367ee465341ecd3e19953a# Parent  53b4890461a526a8f121cfd2e15be3c5d792735e
merge

diff -r 3e4f6534bb15 -r 346eb72a2a6a .hgtags
--- a/.hgtags	Mon May 21 22:00:49 2012 +0200
+++ b/.hgtags	Tue May 22 03:07:14 2012 +0200
@@ -43,3 +43,4 @@
 371e690018ea59317682bce44e7b3c33c70d129a v2.beta2
 3e9457cfc6b195fc72760b5b22981e2e7b9c84d8 v2.beta3
 ab68f1d0f78e8a5363e30c191e58230ff83aa2ac v2.beta4
+62923420b7f86d7a1ca0dfe8853aa85f36abfec9 v2.beta5
diff -r 3e4f6534bb15 -r 346eb72a2a6a config/default.lua
--- a/config/default.lua	Mon May 21 22:00:49 2012 +0200
+++ b/config/default.lua	Tue May 22 03:07:14 2012 +0200
@@ -10,7 +10,7 @@
 end
 
 config.app_name = "LiquidFeedback"
-config.app_version = "2.beta4"
+config.app_version = "2.beta5"
 
 config.instance_name = request.get_config_name()
 
diff -r 3e4f6534bb15 -r 346eb72a2a6a model/member.lua