Merge branch 'remove-error' of https://github.com/umago/python-json-patch

Conflicts:
	jsonpatch.py

Author: stefankoegl

jsonpatch.py

@@ -387,7 +387,8 @@ def apply(self, obj):
         try:
             del subobj[part]
         except (KeyError, IndexError) as ex:
-            raise JsonPatchConflict(str(ex))
+            msg = "can't remove non-existent object '{0}'".format(part)
+            raise JsonPatchConflict(msg)
 
         return obj