Remove the arbitrary cap on the circular buffer row size
Merge branch 'dev' of github.com:mozilla-services/lua_sandbox into dev
Issue #53 Update FirefoxOS match string
Add an lsb_set_error method

https://github.com/mozilla-services/heka/issues/1191
Merge pull request #54 from mozilla-services/set_error

Add an lsb_set_error method
Merge remote-tracking branch 'upstream/dev' into haproxy-grammar