comparison app/models/.svn/text-base/journal.rb.svn-base @ 41:7f0e922c8982 luisf

merged with new version from trunk
author luisf
date Fri, 19 Nov 2010 14:45:28 +0000
parents 40f7cfd4df19
children cbce1fd3b1b7
comparison
equal deleted inserted replaced
35:67e8aef29de9 41:7f0e922c8982