Merge branch 'eric'

Conflicts: pyfpdb/DerivedStats.py - identical change was already pulled
2010-08-02 14:30:29 +02:00
parent 1b4b335b29 457592f912
commit 102cfa5d88
5 changed files with 31 additions and 21 deletions
@@ -3741,6 +3741,7 @@ class Sql:
                                           AND   type=%s
                                           AND   category=%s
                                           AND   limitType=%s
+                                           AND   currency=%s
                                           AND   smallBlind=%s
                                           AND   bigBlind=%s
        """