Merge branch 'master' of git://github.com/openlibrary/bookreader
authorscollett <stephanie.collett@ucop.edu>
Fri, 13 Nov 2009 23:51:13 +0000 (15:51 -0800)
committerscollett <stephanie.collett@ucop.edu>
Fri, 13 Nov 2009 23:51:13 +0000 (15:51 -0800)
commit1426267ededc793dcfdf687c1b40d39521772a7f
tree7f40c71a71b68d1164afeace12b7eef956430fc4
parent519f31ce2e7b5c2d3e35b2a3a6b3af8a94e8f70d
parentd48ea2b164c60bd8f5caf8831c9d98a270778b3c
Merge branch 'master' of git://github.com/openlibrary/bookreader