ce1c09217327e82c06ef5dc456c2a700258f18e6 8ebc54cf3a9d501fba196dd3f0ac50616cb279bc Reinier Balt lrbalt@gmail.com http://github.com/bsag/tracks/commit/258958ebdf51c7a64493569c2024ac16b6a3da1c 258958ebdf51c7a64493569c2024ac16b6a3da1c 2008-06-24T11:36:40-07:00 2008-06-24T11:36:40-07:00 solve merge conflict Merge branch 'master' of git://github.com/bsag/tracks Conflicts: .gitignore f4df495e3fa078ebcd7d8e470b0311141e81619d Reinier Balt lrbalt@gmail.com