ComputationalRadiationPhysics/picongpu — pull request #35 by ax3l (2013-08-26 15:45:06+00:00)
Title: Decode all JSON fields and clean conflict result

*Feature*: If a merge conflict occures, set the failure status and exit in a clean way.

*Bugfix*: decode all JSON data, not only URLs (for example, if someone uses / in a branch name)