Merge branch 'json-tag-parser' into json
commite454b8962cdb68cf8d41813ffc55a1a620925845
authorColomban Wendling <ban@herbesfolles.org>
Sat, 31 Jan 2015 21:17:26 +0000 (31 22:17 +0100)
committerColomban Wendling <ban@herbesfolles.org>
Sat, 31 Jan 2015 21:17:26 +0000 (31 22:17 +0100)
treeb5b9462f3f287e3b8f621fcaeee96052594576a4
parentb0cf3b4e2ddaacc952c1683375965c9ff2e0d51e
parent270e32327f4d9776afb2047108da8550afbf3f83
Merge branch 'json-tag-parser' into json

Import JSON tag parser from CTags:
https://github.com/fishman/ctags/blob/master/json.c