Merge branch 'master' of git.shadowcat.co.uk:Oyster
authorhakim <hakim@vm-participo.(none)>
Sat, 20 Nov 2010 17:21:55 +0000 (17:21 +0000)
committerhakim <hakim@vm-participo.(none)>
Sat, 20 Nov 2010 17:21:55 +0000 (17:21 +0000)
commitb58fce2ce55e367088152f728d4fd3b475006607
tree160e1840bc40071704fb93bd75b73f9367b0ade7
parent919b8f969a3a3fc0c964444604d5bd34291d94de
parent29bd3b913e29d594893e25ceb02dbd8150cf3c81
Merge branch 'master' of git.shadowcat.co.uk:Oyster