Merge branch 'master' of git://github.com/openlibrary/bookreader
authorscollett <stephanie.collett@ucop.edu>
Tue, 15 Sep 2009 19:35:26 +0000 (12:35 -0700)
committerscollett <stephanie.collett@ucop.edu>
Tue, 15 Sep 2009 19:35:26 +0000 (12:35 -0700)
commit519f31ce2e7b5c2d3e35b2a3a6b3af8a94e8f70d
tree629addd13ab8211d6bc2f15d8119cbc5e7d73f45
parenta2063ceff2751aca11e3aa5a569041c492752801
parent55fe5aec6da8bf252ddc3f3e091e4035d2f43c72
Merge branch 'master' of git://github.com/openlibrary/bookreader