Merge branch 'master' of gitorious.codethink.co.uk:moonshot-ui/moonshot-ui
authorPete Fotheringham <pete.fotheringham@codethink.co.uk>
Wed, 1 Feb 2012 14:35:56 +0000 (14:35 +0000)
committerPete Fotheringham <pete.fotheringham@codethink.co.uk>
Wed, 1 Feb 2012 14:35:56 +0000 (14:35 +0000)

Trivial merge