From: Javier Jardón <javier.jardon@codethink.co.uk>
Date: Tue, 14 Jun 2011 15:06:36 +0000 (+0100)
Subject: Merge branch 'master' of gitorious.codethink.co.uk:moonshot-ui/moonshot-ui into gitorious
X-Git-Tag: 0.7.1~239^2~15
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=moonshot-ui.git;a=commitdiff_plain;h=718ce09615dd09a63c623551b9ee85215c39d99b

Merge branch 'master' of gitorious.codethink.co.uk:moonshot-ui/moonshot-ui into gitorious
---

718ce09615dd09a63c623551b9ee85215c39d99b