Merge commit 'ol/newui' into newui
authorrajbot <raj@archive.org>
Tue, 12 Oct 2010 21:38:47 +0000 (21:38 +0000)
committerrajbot <raj@archive.org>
Tue, 12 Oct 2010 21:38:47 +0000 (21:38 +0000)
commit4078ef8eae0fbf678ff7128ff53062279c2391ef
tree3f8520ee2e9ce4834fcac95af816e0b36ca0595d
parent2f18c355b86fad952ddbecc2c623823405cec310
parentb3bd264dcbb1471621319d5c24c54923fe0c7e9d
Merge commit 'ol/newui' into newui

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