Branch merge

author Éric Araujo <aeric@mtlpy.org>

Sun, 9 Dec 2012 03:47:03 +0000 (22:47 -0500)

committer Éric Araujo <aeric@mtlpy.org>

Sun, 9 Dec 2012 03:47:03 +0000 (22:47 -0500)
author Éric Araujo <aeric@mtlpy.org>
Sun, 9 Dec 2012 03:47:03 +0000 (22:47 -0500)
committer Éric Araujo <aeric@mtlpy.org>
Sun, 9 Dec 2012 03:47:03 +0000 (22:47 -0500)
diff --cc Misc/ACKS
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Éric Araujo <aeric@mtlpy.org>
	Sun, 9 Dec 2012 03:47:03 +0000 (22:47 -0500)
committer	Éric Araujo <aeric@mtlpy.org>
	Sun, 9 Dec 2012 03:47:03 +0000 (22:47 -0500)
		1	2
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history