Merge branch 'production'

* production:
  Allow Influence.todo to be blank.

diff --cc influences/models.py
index 2c626266fde1312aa9b6445bd66ac647c6e4b112,6464e683deb20a1277c4cdf2537a4be5661640b8..8f243f5b49de90f250e0949b7a2e98f958f513ff
--- 1/influences/models.py
--- 2/influences/models.py
+++ b/influences/models.py
@@@ -46,12 -38,11 +46,12 @@@ class Influence(models.Model)
      created     = models.DateField(auto_now_add=1, verbose_name = _("Creation time"))
      modified    = models.DateField(auto_now=1, verbose_name = _("Modification time"))
      
 -    character   = models.ForeignKey(Character, verbose_name = _("Character"))
 -    contact     = models.CharField(max_length=255, verbose_name = _("Contact Name"))
 +    initiator   = models.ForeignKey(Character, verbose_name = _("Initiator"), related_name='initiated_influences')
 +    other_contacts = models.CharField(max_length=255, blank = True, verbose_name = _("Other Contacts"))
 +    other_characters = models.ManyToManyField(Character, blank = True, verbose_name = _("Involved characters"), related_name='influences_involved_in')
      summary     = models.CharField(max_length=255, verbose_name = _("Summary"))
      description = models.TextField(verbose_name = _("Description"))
-     todo        = models.TextField(verbose_name = _("Todo"))
+     todo        = models.TextField(blank=True, verbose_name = _("Todo"))
      status      = models.CharField(max_length=1, choices=STATUS_CHOICES, default='N', verbose_name = _("Status"))
      longterm    = models.BooleanField(default=False, verbose_name = _("Long term"))