fixed missed conflict in last commit
fixed missed conflict in last commit

chromakey/django-salesforce,chromakey/django-salesforce,hynekcer/django-salesforce,chromakey/django-salesforce,philchristensen/django-salesforce,philchristensen/django-salesforce,django-salesforce/django-salesforce,django-salesforce/django-salesforce,hynekcer/django-salesforce,hynekcer/django-salesforce,philchristensen/django-salesforce,django-salesforce/django-salesforce