From: Francis Russell <francis@unchartedbackwaters.co.uk>
Date: Wed, 12 Sep 2012 14:24:35 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into haskell
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=7e3f7c86ddf4c8ff1cf266ed96206fb28cace0c2;p=francis%2Fofc.git

Merge remote-tracking branch 'origin/master' into haskell
---

7e3f7c86ddf4c8ff1cf266ed96206fb28cace0c2