From: hakim <hakim@vm-participo.(none)>
Date: Sat, 20 Nov 2010 22:12:43 +0000 (+0000)
Subject: Merge branch 'master' of git.shadowcat.co.uk:Oyster
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=742f639cd40ac3ae2b3dc5531389c73ad462c73b;p=p5sagit%2FOyster.git

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

742f639cd40ac3ae2b3dc5531389c73ad462c73b