Merged updates from trunk into stable branch
[feedcatcher.git] / vendor / rails / activerecord / lib / active_record / locking /
drwxr-xr-x   ..
-rw-r--r-- 6577 optimistic.rb
-rw-r--r-- 3383 pessimistic.rb