Merge branch 'master' of git://git.assembla.com/fpdboz.git

pyfpdb/GuiSessionViewer.py

@@ -21,7 +21,11 @@ pygtk.require('2.0')
 import gtk
 import os
 from time import time, strftime, localtime
-from numpy import diff, nonzero
+try:
+    from numpy import diff, nonzero
+except:
+    print """Failed to load numpy in Session Viewer"""
+    print """This is of no consequence as the module currently doesn't do anything."""
 
 import Card
 import fpdb_import

pyfpdb/Hand.py

@@ -472,7 +472,6 @@ Add a raise on [street] by [player] to [amountTo]
 For when a player shows cards for any reason (for showdown or out of choice).
 Card ranks will be uppercased
 """
-        import sys; sys.exit(1)
         log.debug("addShownCards %s hole=%s all=%s" % (player, cards,  holeandboard))
         if cards is not None:
             self.addHoleCards(cards,player,shown, mucked)