Merge remote-tracking branch 'remotes/paurkedal/t/disclaim-pullreq' into paurkedal...

author Ivan Maidanski <ivmai@mail.ru>

Fri, 23 Sep 2011 10:47:59 +0000 (14:47 +0400)

committer Ivan Maidanski <ivmai@mail.ru>

Fri, 23 Sep 2011 10:47:59 +0000 (14:47 +0400)
author Ivan Maidanski <ivmai@mail.ru>
Fri, 23 Sep 2011 10:47:59 +0000 (14:47 +0400)
committer Ivan Maidanski <ivmai@mail.ru>
Fri, 23 Sep 2011 10:47:59 +0000 (14:47 +0400)
diff --cc Makefile.am
Simple merge
diff --cc Makefile.direct
Simple merge
diff --cc Makefile.dj
Simple merge
diff --cc configure.ac
Simple merge
diff --cc mark.c
Simple merge
diff --cc tests/tests.am
Simple merge
author	Ivan Maidanski <ivmai@mail.ru>
	Fri, 23 Sep 2011 10:47:59 +0000 (14:47 +0400)
committer	Ivan Maidanski <ivmai@mail.ru>
	Fri, 23 Sep 2011 10:47:59 +0000 (14:47 +0400)
		1	2
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile.direct	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile.dj	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
mark.c	patch \|	diff1 \|	diff2 \|	blob \| history
tests/tests.am	patch \|	diff1 \|	diff2 \|	blob \| history