From: Francis Russell <francis@unchartedbackwaters.co.uk>
Date: Fri, 14 Sep 2012 13:53:34 +0000 (+0100)
Subject: Merge branch 'master' into haskell
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=1339a794579f0445d0207082a5bbbc8c0bd4efb9;p=francis%2Fofc.git

Merge branch 'master' into haskell

Conflicts:
	examples/integrals_pos.ofl
---

1339a794579f0445d0207082a5bbbc8c0bd4efb9