Merge raj's read to me feature.
authorrajbot <raj@archive.org>
Tue, 12 Oct 2010 21:38:47 +0000 (21:38 +0000)
committerMichael Ang <mang@archive.org>
Tue, 12 Oct 2010 21:52:50 +0000 (21:52 +0000)
commit32dcce1c6c33c22670b8c651356595c6a8c2a0ad
tree3f8520ee2e9ce4834fcac95af816e0b36ca0595d
parent2f18c355b86fad952ddbecc2c623823405cec310
parentb3bd264dcbb1471621319d5c24c54923fe0c7e9d
Merge raj's read to me feature.

Merge commit 'ol/newui' into newui

Conflicts:
BookReader/BookReader.css
BookReader/BookReader.js
BookReader/BookReader.css
BookReader/BookReader.js
BookReaderIA/inc/BookReader.inc