Merge remote-tracking branch 'alexis/libs/json' into next
authorJean Privat <jean@pryen.org>
Tue, 28 May 2013 15:13:07 +0000 (11:13 -0400)
committerJean Privat <jean@pryen.org>
Tue, 28 May 2013 15:13:07 +0000 (11:13 -0400)
commit417d2ba76b0ebc6b0518d309f517ce6dcd752a80
tree62baf61a8976163be9ae1b4b156c3bdfab6cf623
parent52587bb46bffa45e2c656b93a2ddc1592b5d531e
parent0423308c758b1beecb06187ef5b3bdda830ba932
Merge remote-tracking branch 'alexis/libs/json' into next

Conflicts:
tests/nitg-e.skip
tests/nitg-s.skip
tests/nitg.skip
tests/niti.skip