Merge changes from dev

author Michael D. Lowis <mike@mdlowis.com>

Wed, 30 Jul 2014 01:52:57 +0000 (21:52 -0400)

committer Michael D. Lowis <mike@mdlowis.com>

Wed, 30 Jul 2014 01:52:57 +0000 (21:52 -0400)
author Michael D. Lowis <mike@mdlowis.com>
Wed, 30 Jul 2014 01:52:57 +0000 (21:52 -0400)
committer Michael D. Lowis <mike@mdlowis.com>
Wed, 30 Jul 2014 01:52:57 +0000 (21:52 -0400)
diff --cc source/buffer/buf.h
Simple merge
diff --cc source/list/list.h
Simple merge
diff --cc source/vector/vec.h
Simple merge
author	Michael D. Lowis <mike@mdlowis.com>
	Wed, 30 Jul 2014 01:52:57 +0000 (21:52 -0400)
committer	Michael D. Lowis <mike@mdlowis.com>
	Wed, 30 Jul 2014 01:52:57 +0000 (21:52 -0400)
		1	2
source/buffer/buf.h	patch \|	diff1 \|	diff2 \|	blob \| history
source/list/list.h	patch \|	diff1 \|	diff2 \|	blob \| history
source/vector/vec.h	patch \|	diff1 \|	diff2 \|	blob \| history