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 pull -r default https://bitbucket.org/frog32/django-piston
by default the json emitter uses 4 spaces indent to pretty print it's output. this commit changes this to not use pretty print if debug ist set to false. we managed to reduce some responses by 50% with this.