Merge branch 'master' of github.com:basho-labs/wterl

Conflicts:
	c_src/wiredtiger-build.patch
This commit is contained in:
Gregory Burd 2013-04-26 10:37:06 -04:00
commit bfc180eeb3