Merge branch '1.2'

author Petri Lehtinen <petri@digip.org>

Tue, 23 Mar 2010 06:15:19 +0000 (08:15 +0200)

committer Petri Lehtinen <petri@digip.org>

Tue, 23 Mar 2010 06:15:19 +0000 (08:15 +0200)
author Petri Lehtinen <petri@digip.org>
Tue, 23 Mar 2010 06:15:19 +0000 (08:15 +0200)
committer Petri Lehtinen <petri@digip.org>
Tue, 23 Mar 2010 06:15:19 +0000 (08:15 +0200)
diff --cc configure.ac
Simple merge
diff --cc src/dump.c
Simple merge
diff --cc src/value.c
Simple merge
author	Petri Lehtinen <petri@digip.org>
	Tue, 23 Mar 2010 06:15:19 +0000 (08:15 +0200)
committer	Petri Lehtinen <petri@digip.org>
	Tue, 23 Mar 2010 06:15:19 +0000 (08:15 +0200)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/dump.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/value.c	patch \|	diff1 \|	diff2 \|	blob \| history