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)

Trivial merge