Merge branch 'master' of ssh://zarb.org/srv/git/booh

author Guillaume Cottenceau <gcottenc@gmail.com>

Tue, 4 Jan 2011 20:57:05 +0000 (21:57 +0100)

committer Guillaume Cottenceau <gcottenc@gmail.com>

Tue, 4 Jan 2011 20:57:05 +0000 (21:57 +0100)
author Guillaume Cottenceau <gcottenc@gmail.com>
Tue, 4 Jan 2011 20:57:05 +0000 (21:57 +0100)
committer Guillaume Cottenceau <gcottenc@gmail.com>
Tue, 4 Jan 2011 20:57:05 +0000 (21:57 +0100)
diff --cc data/booh/themes/cardu/root/booh.js
Simple merge
diff --cc data/booh/themes/dark/root/booh.js
Simple merge
diff --cc data/booh/themes/gradient/root/booh.js
Simple merge
diff --cc data/booh/themes/sbs/root/booh.js
Simple merge
diff --cc data/booh/themes/simple/root/booh.js
Simple merge
author	Guillaume Cottenceau <gcottenc@gmail.com>
	Tue, 4 Jan 2011 20:57:05 +0000 (21:57 +0100)
committer	Guillaume Cottenceau <gcottenc@gmail.com>
	Tue, 4 Jan 2011 20:57:05 +0000 (21:57 +0100)
		1	2
data/booh/themes/cardu/root/booh.js	patch \|	diff1 \|	diff2 \|	blob \| history
data/booh/themes/dark/root/booh.js	patch \|	diff1 \|	diff2 \|	blob \| history
data/booh/themes/gradient/root/booh.js	patch \|	diff1 \|	diff2 \|	blob \| history
data/booh/themes/sbs/root/booh.js	patch \|	diff1 \|	diff2 \|	blob \| history
data/booh/themes/simple/root/booh.js	patch \|	diff1 \|	diff2 \|	blob \| history