comparison app/models/principal.rb @ 513:c3c01edd24bb cannam

Merge from branch "live"
author Chris Cannam
date Thu, 14 Jul 2011 10:44:50 +0100
parents 40f7cfd4df19
children cbb26bc654de
comparison
equal deleted inserted replaced
509:c1f5f0299180 513:c3c01edd24bb