#16937: merge with 3.3.

author Ezio Melotti <ezio.melotti@gmail.com>

Thu, 25 Jul 2013 03:04:50 +0000 (05:04 +0200)

committer Ezio Melotti <ezio.melotti@gmail.com>

Thu, 25 Jul 2013 03:04:50 +0000 (05:04 +0200)
author Ezio Melotti <ezio.melotti@gmail.com>
Thu, 25 Jul 2013 03:04:50 +0000 (05:04 +0200)
committer Ezio Melotti <ezio.melotti@gmail.com>
Thu, 25 Jul 2013 03:04:50 +0000 (05:04 +0200)
diff --cc Doc/using/cmdline.rst
Simple merge
diff --cc Misc/ACKS
Simple merge
diff --cc Modules/main.c
Simple merge
author	Ezio Melotti <ezio.melotti@gmail.com>
	Thu, 25 Jul 2013 03:04:50 +0000 (05:04 +0200)
committer	Ezio Melotti <ezio.melotti@gmail.com>
	Thu, 25 Jul 2013 03:04:50 +0000 (05:04 +0200)
		1	2
Doc/using/cmdline.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/main.c	patch \|	diff1 \|	diff2 \|	blob \| history