From: Luke Williams <shmookey@heathen.local>
Date: Tue, 10 Mar 2009 10:52:59 +0000 (+0900)
Subject: Merge branch 'master' of ssh://localhost:29/usr/local/git/ucc-site
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;ds=sidebyside;h=00ff69b55fa4d4c25eed1c84e6202c69205d118b;p=ucc-www.git

Merge branch 'master' of ssh://localhost:29/usr/local/git/ucc-site
---

00ff69b55fa4d4c25eed1c84e6202c69205d118b