annotate .svn/pristine/57/57c1667a6b0b8222beaeafcee0db4e38818fa2d0.svn-base @ 1204:d24c22d420eb live

Merge from branch "cannam"
author Chris Cannam
date Wed, 23 Jan 2013 11:46:22 +0000
parents cbb26bc654de
children
rev   line source
Chris@909 1 require File.dirname(__FILE__) + "/rails/init"