Bitbucket cannot automatically merge this request.
The commits that make up this pull request have been removed.
Bitbucket cannot automatically merge this request due to conflicts.
Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:
hg update default
hg pull -r django15 https://bitbucket.org/berrueta/vapour
hg merge django15
hg commit -m 'Merged in berrueta/vapour/django15 (pull request #3)'
Minimal change required to upgrade to Django 1.5