From: Matthijs Kooijman <m.kooijman@student.utwente.nl>
Date: Mon, 15 Jun 2009 10:01:42 +0000 (+0200)
Subject: Merge branch 'production'
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;ds=inline;h=884bf66b55546555bfd3df318b9318e8358b02cf;hp=884bf66b55546555bfd3df318b9318e8358b02cf;p=matthijs%2Fprojects%2Fxerxes.git

Merge branch 'production'

* production:
  Remove SQL password from import.py.
  Add code to support disabling new influences.
  Remove \r's.
  Only notify a player of finished influence changes.
---