Merge branch 'master' of git+ssh://ln.pjr.cc/glcas
authorpaulr <me@pjr.cc>
Wed, 3 Aug 2011 02:02:53 +0000 (12:02 +1000)
committerpaulr <me@pjr.cc>
Wed, 3 Aug 2011 02:02:53 +0000 (12:02 +1000)

Trivial merge