Merge commit 'origin/json-client'
authorJakub Skoczen <jakub@indexdata.dk>
Mon, 12 Apr 2010 09:54:49 +0000 (11:54 +0200)
committerJakub Skoczen <jakub@indexdata.dk>
Mon, 12 Apr 2010 09:54:49 +0000 (11:54 +0200)
commit61b0286e7f7c7c496dd61cfc0dc6c997f43f23f4
tree6471cf6b14f74ef98905d2901c162fc038d1d685
parentd579b5a9851d54eae72e67d617647138162abef6
parent555ce40e9d956821e2976288405937761bc7aac4
Merge commit 'origin/json-client'