Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
CJentzsch 2015-02-23 11:31:29 +01:00
commit cb52754e6c

View File

@ -25,7 +25,6 @@
"foo": { "foo": {
"in": { "in": {
"foo": "bar", "foo": "bar",
"food": "bat",
"food": "bass" "food": "bass"
}, },
"root": "0x17beaa1648bafa633cda809c90c04af50fc8aed3cb40d16efbddee6fdf63c4c3" "root": "0x17beaa1648bafa633cda809c90c04af50fc8aed3cb40d16efbddee6fdf63c4c3"