Merge branch 'split-options-config'
authorKim Nguyễn <kn@lri.fr>
Fri, 26 Oct 2012 12:40:15 +0000 (14:40 +0200)
committerKim Nguyễn <kn@lri.fr>
Fri, 26 Oct 2012 12:40:15 +0000 (14:40 +0200)
Conflicts:
src/main.ml
src/runtime.ml


Trivial merge