Merge pull request #366 from slapresta/inversed-contains

author Nico Williams <nico@cryptonector.com>

Sat, 27 Dec 2014 04:00:41 +0000 (22:00 -0600)

committer Nico Williams <nico@cryptonector.com>

Sat, 27 Dec 2014 04:00:41 +0000 (22:00 -0600)
author Nico Williams <nico@cryptonector.com>
Sat, 27 Dec 2014 04:00:41 +0000 (22:00 -0600)
committer Nico Williams <nico@cryptonector.com>
Sat, 27 Dec 2014 04:00:41 +0000 (22:00 -0600)
diff --cc builtin.c
Simple merge
diff --cc docs/content/3.manual/manual.yml
Simple merge
author	Nico Williams <nico@cryptonector.com>
	Sat, 27 Dec 2014 04:00:41 +0000 (22:00 -0600)
committer	Nico Williams <nico@cryptonector.com>
	Sat, 27 Dec 2014 04:00:41 +0000 (22:00 -0600)
		1	2
builtin.c	patch \|	diff1 \|	diff2 \|	blob \| history
docs/content/3.manual/manual.yml	patch \|	diff1 \|	diff2 \|	blob \| history