From: Paul Tipper <tipper@denton.lancs.ac.uk>
Date: Sat, 20 Nov 2010 19:18:35 +0000 (+0000)
Subject: Merge branch 'master' of p5sagit@git.shadowcat.co.uk:Oyster
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=6c983a4a9ffd4e9b2890c91f43b5e9c8c087704b;p=p5sagit%2FOyster.git

Merge branch 'master' of p5sagit@git.shadowcat.co.uk:Oyster
---

6c983a4a9ffd4e9b2890c91f43b5e9c8c087704b