Merge branch 'newui' of git@github.com:openlibrary/bookreader into newui
authorrajbot <raj@archive.org>
Sat, 16 Oct 2010 00:33:57 +0000 (00:33 +0000)
committerrajbot <raj@archive.org>
Sat, 16 Oct 2010 00:33:57 +0000 (00:33 +0000)
commit6d88872cb24a0a81fae18df38fbb2a94ddf5da55
tree18967282956c914e30f014c4751c15f1262a7434
parent6781b24a95d056cd00d986045ebf880329e7fc49
parent3decfd68c920cd8d2ae3e4029d0346e1bec89de2
Merge branch 'newui' of git@github.com:openlibrary/bookreader into newui

Conflicts:
BookReader/BookReader.js
BookReader/BookReader.js