all: adds module metadata as suggested by fperrad
all: adds module metadata as suggested by fperrad
all: adds module metadata as suggested by fperrad
docs: adds merge behavior documentation
decoder: fixes compatibility with lpeg 0.12 by closing off 0-length captures in loops
docs: updates LPeg testing information
docs: Documents 1.3.2 release
base: rockspec 1.3.2-1 base prep
base: fixes link for luarocks download
base: updates rock creation tool to include tag version
base: rockspec 1.3.2-2 setup
decoder: fixes compatibility with lpeg 0.12 by closing off 0-length captures in loops

Conflicts:
	lua/json/decode/util.lua
Merge branch '1.0.x' into 1.1.x
Merge branch '1.1.x' into 1.2.x
base: Makefile learns LUNIT_BIN value
tests: fixes lunit test to work with Lua 5.2 environment management
tests: fixes lunit test to work with Lua 5.2 environment management
Merge branch '1.0.x' into 1.1.x
Merge branch '1.1.x' into 1.2.x
Merge branch '1.2.x'