fixing conflict after merging
authorAlexandr Popov <popov2al@gmail.com>
Sat, 28 Feb 2009 12:18:19 +0000 (15:18 +0300)
committerAlexandr Popov <popov2al@gmail.com>
Sat, 28 Feb 2009 12:18:19 +0000 (15:18 +0300)
commitfa85cd000d349eda2bf4da2c5cdbf1b69afad752
tree4c88b8070bccb140560fb806436e2b9c1edd181d
parent821d4c800e26480ed5d990ec3b9a80eaf361d83d
parent1300714d1ce0c857bdf5b7da60848551a50e4a68
fixing conflict after merging
src/findit.py