Merge branch 'master' of gitorious.org:moonshot-identity-client/moonshot-client
authorPete Fotheringham <pete.fotheringham@codethink.co.uk>
Fri, 9 Dec 2011 14:25:20 +0000 (14:25 +0000)
committerPete Fotheringham <pete.fotheringham@codethink.co.uk>
Fri, 9 Dec 2011 14:25:20 +0000 (14:25 +0000)

Trivial merge