Merge branch 'master' of git@github.com:openlibrary/bookreader into browserlending
authorrajbot <raj@archive.org>
Tue, 15 Feb 2011 21:23:08 +0000 (21:23 +0000)
committerrajbot <raj@archive.org>
Tue, 15 Feb 2011 21:23:08 +0000 (21:23 +0000)
commitd19341d2b30fade97502fd4ee64a493a150afab5
tree74a722019c2356b377845215080dded767c770f1
parent6df177dc4bf36ba87092b21ad6020e7a9a67198d
parent76a292ce5b3c88818136a39425fbd0b645f45e8d
Merge branch 'master' of git@github.com:openlibrary/bookreader into browserlending
BookReaderIA/datanode/BookReaderJSIA.php
BookReaderIA/inc/BookReader.inc