RichmondDay/www.mini.ca — pull request #529 by jonezy (2014-03-10 10:21:11+00:00)
Title: there was a merge conflict marker that got in here somehow

Signed-off-by: Chris Jones