Merge branch 'master' of gitorious.codethink.co.uk:moonshot-ui/moonshot-ui
authorPete Fotheringham <pete.fotheringham@codethink.co.uk>
Tue, 20 Dec 2011 12:40:15 +0000 (12:40 +0000)
committerPete Fotheringham <pete.fotheringham@codethink.co.uk>
Tue, 20 Dec 2011 12:40:15 +0000 (12:40 +0000)

Trivial merge