To check out this repository please hg clone the following URL, or open the URL using EasyMercurial or your preferred Mercurial client.
hg clone
History | View | Annotate | Download (233 Bytes)
Merge cannam's latest changes.
edit renamed to update in controller
Merge from live
Merge from the default branch
Merge from cannam_integration
Rename .erb to .html.erb in line with the convention