?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 5ea147f b7055a7)
Merge branch '1.2.x'
commit89cd7ee48b8d9e10e45cc919bb900576d0af4896
authorThomas Harning Jr <harningt@gmail.com>
Fri, 19 Sep 2014 19:38:51 +0000 (19 15:38 -0400)
committerThomas Harning Jr <harningt@gmail.com>
Fri, 19 Sep 2014 19:38:51 +0000 (19 15:38 -0400)
tree2f5c938d637bf94d661bc66b3426ff23089b0d15tree | snapshot (tar.gz zip)
parent5ea147fb6520dcc36f07705a012d87db019d8c6acommit | diff
parentb7055a7558411490b69f7bef189a92d3ae651f91commit | diff
Merge branch '1.2.x'

* 1.2.x:
  base: fixes travis
JSON Parser/Constructor for Lua Uses LPeg to decode JSON and tables to encode JSON See canonical GitHub repository: https://www.github.com/harningt/luajson. See http://www.ohloh.net/projects/11513