From: Kim Nguyễn <kn@lri.fr>
Date: Fri, 26 Oct 2012 12:40:15 +0000 (+0200)
Subject: Merge branch 'split-options-config'
X-Git-Url: http://git.nguyen.vg/gitweb/?p=SXSI%2Fxpathcomp.git;a=commitdiff_plain;h=4516c5fe48693d769b62b987fe561d9aa8951695

Merge branch 'split-options-config'

Conflicts:
	src/main.ml
	src/runtime.ml
---

4516c5fe48693d769b62b987fe561d9aa8951695