annotate .svn/pristine/ad/ad198b4ca217e676200add6d2e30b0345b1e653c.svn-base @ 972:710921c48f06 live

Merge from branch "cannam"
author Chris Cannam
date Fri, 19 Oct 2012 14:47:53 +0100
parents cbb26bc654de
children
rev   line source
Chris@909 1 david_action_controller:
Chris@909 2 developer_id: 1
Chris@909 3 project_id: 2
Chris@909 4 joined_on: 2004-10-10
Chris@909 5
Chris@909 6 david_active_record:
Chris@909 7 developer_id: 1
Chris@909 8 project_id: 1
Chris@909 9 joined_on: 2004-10-10
Chris@909 10
Chris@909 11 jamis_active_record:
Chris@909 12 developer_id: 2
Chris@909 13 project_id: 1