Merge branch 'master' of http://www.project-moonshot.org/git/moonshot-ui into debian
authorKevin Wasserman <krwasserman@hotmail.com>
Thu, 16 May 2013 17:41:50 +0000 (13:41 -0400)
committerKevin Wasserman <krwasserman@hotmail.com>
Thu, 16 May 2013 17:41:50 +0000 (13:41 -0400)

Trivial merge