Merge branch 'master' of git@github.com:openlibrary/bookreader into browserlending

author rajbot <raj@archive.org>

Tue, 15 Feb 2011 21:23:08 +0000 (21:23 +0000)

committer rajbot <raj@archive.org>

Tue, 15 Feb 2011 21:23:08 +0000 (21:23 +0000)
author rajbot <raj@archive.org>
Tue, 15 Feb 2011 21:23:08 +0000 (21:23 +0000)
committer rajbot <raj@archive.org>
Tue, 15 Feb 2011 21:23:08 +0000 (21:23 +0000)
diff --cc BookReaderIA/datanode/BookReaderJSIA.php
Simple merge
diff --cc BookReaderIA/inc/BookReader.inc
Simple merge
author	rajbot <raj@archive.org>
	Tue, 15 Feb 2011 21:23:08 +0000 (21:23 +0000)
committer	rajbot <raj@archive.org>
	Tue, 15 Feb 2011 21:23:08 +0000 (21:23 +0000)
		1	2
BookReaderIA/datanode/BookReaderJSIA.php	patch \|	diff1 \|	diff2 \|	blob \| history
BookReaderIA/inc/BookReader.inc	patch \|	diff1 \|	diff2 \|	blob \| history