Resolve conflicts with upstream repository
[bookreader.git] / README.txt
2008-11-06 Raj Kumarfirst checkin