Merge branch 'master' into history

author Bastien Dejean <nihilhill@gmail.com>

Wed, 6 Mar 2013 13:00:33 +0000 (14:00 +0100)

committer Bastien Dejean <nihilhill@gmail.com>

Wed, 6 Mar 2013 13:00:33 +0000 (14:00 +0100)
author Bastien Dejean <nihilhill@gmail.com>
Wed, 6 Mar 2013 13:00:33 +0000 (14:00 +0100)
committer Bastien Dejean <nihilhill@gmail.com>
Wed, 6 Mar 2013 13:00:33 +0000 (14:00 +0100)
diff --cc messages.c
Simple merge
diff --cc tree.c
Simple merge
author	Bastien Dejean <nihilhill@gmail.com>
	Wed, 6 Mar 2013 13:00:33 +0000 (14:00 +0100)
committer	Bastien Dejean <nihilhill@gmail.com>
	Wed, 6 Mar 2013 13:00:33 +0000 (14:00 +0100)
		1	2
messages.c	patch \|	diff1 \|	diff2 \|	blob \| history
tree.c	patch \|	diff1 \|	diff2 \|	blob \| history