From: Kartik Thakore <thakore.kartik@gmail.com>
Date: Mon, 23 Nov 2009 21:16:40 +0000 (-0500)
Subject: Merge branch 'master' of git.shadowcat.co.uk:SDL-Site
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=7b47a08ac680a54e9651fb9dccf0a031cf9a0085;p=sdlgit%2FSDL-Site.git

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

7b47a08ac680a54e9651fb9dccf0a031cf9a0085