# HG changeset patch
# User bsw
# Date 1338152913 -7200
# Node ID 9f8aa189cac484d78a8abe6a293e43327fae60ba
# Parent  ec7b6beb5be6fb183b5db9bb256729abdc08393f# Parent  8e72475758d8e5dc2a439e1bf445c07b5f6a40d5
merge

diff -r ec7b6beb5be6 -r 9f8aa189cac4 .hgtags
--- a/.hgtags	Thu May 24 00:16:19 2012 +0200
+++ b/.hgtags	Sun May 27 23:08:33 2012 +0200
@@ -39,9 +39,11 @@
 bf735d8095aa237e0283305fc0c37527572248e7 beta32
 4905d7d79486cee780b715a90dcd643e936b6a7a beta33
 55939cbde1a5d318c3342fabee841748cc3d7886 beta34
+f7bc22fbf660bd8ac57a1d715d6faabc3e34ba7f beta35
 74f768a162e1d941158bde5a3e42bb8a71af5090 v2.beta1
 371e690018ea59317682bce44e7b3c33c70d129a v2.beta2
 3e9457cfc6b195fc72760b5b22981e2e7b9c84d8 v2.beta3
 ab68f1d0f78e8a5363e30c191e58230ff83aa2ac v2.beta4
 62923420b7f86d7a1ca0dfe8853aa85f36abfec9 v2.beta5
+9447ea55539854311a4229fbef12e51ee8be6bf1 v2.beta6
 f5b95602507ac9884e7e943cc1eab9da91ff890b translate
diff -r ec7b6beb5be6 -r 9f8aa189cac4 app/main/initiative/_show_voting.lua
--- a/app/main/initiative/_show_voting.lua	Thu May 24 00:16:19 2012 +0200
+++ b/app/main/initiative/_show_voting.lua	Sun May 27 23:08:33 2012 +0200
@@ -29,8 +29,8 @@
         :left_join("vote", nil, { "vote.initiative_id = ? AND vote.member_id = member.id", initiative.id })
         :add_field("direct_voter.weight as voter_weight")
         :add_field("coalesce(vote.grade, 0) as grade")
-        :join("initiative", nil, "initiative.id = vote.initiative_id")
-        :join("issue", nil, "issue.id = initiative.issue_id")
+        :left_join("initiative", nil, "initiative.id = vote.initiative_id")
+        :left_join("issue", nil, "issue.id = initiative.issue_id")
     }
   }
 
diff -r ec7b6beb5be6 -r 9f8aa189cac4 config/default.lua
--- a/config/default.lua	Thu May 24 00:16:19 2012 +0200
+++ b/config/default.lua	Sun May 27 23:08:33 2012 +0200
@@ -10,7 +10,7 @@
 end
 
 config.app_name = "LiquidFeedback"
-config.app_version = "2.beta5"
+config.app_version = "2.beta6"
 
 config.instance_name = request.get_config_name()
 
diff -r ec7b6beb5be6 -r 9f8aa189cac4 config/example.lua
--- a/config/example.lua	Thu May 24 00:16:19 2012 +0200
+++ b/config/example.lua	Sun May 27 23:08:33 2012 +0200
@@ -2,7 +2,7 @@
 -- request.set_absolute_baseurl("http://www.example.com/lf/")
 
 config.app_name = "LiquidFeedback"
-config.app_version = "2.beta1"
+config.app_version = "2.beta6"
 
 config.instance_name = request.get_config_name()
 
diff -r ec7b6beb5be6 -r 9f8aa189cac4 model/member.lua