Automated merge with git+ssh://github.com/schinckel/django-boardinghouse
Automated merge with git+ssh://github.com/schinckel/django-boardinghouse

schinckel/django-boardinghouse,schinckel/django-boardinghouse,schinckel/django-boardinghouse