Branch merge

author Éric Araujo <merwok@netwok.org>

Thu, 6 Oct 2011 11:22:21 +0000 (13:22 +0200)

committer Éric Araujo <merwok@netwok.org>

Thu, 6 Oct 2011 11:22:21 +0000 (13:22 +0200)
author Éric Araujo <merwok@netwok.org>
Thu, 6 Oct 2011 11:22:21 +0000 (13:22 +0200)
committer Éric Araujo <merwok@netwok.org>
Thu, 6 Oct 2011 11:22:21 +0000 (13:22 +0200)
diff --cc Include/unicodeobject.h
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Éric Araujo <merwok@netwok.org>
	Thu, 6 Oct 2011 11:22:21 +0000 (13:22 +0200)
committer	Éric Araujo <merwok@netwok.org>
	Thu, 6 Oct 2011 11:22:21 +0000 (13:22 +0200)
		1	2
Include/unicodeobject.h	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history