Merge Internet Archive petabox-related changes
authorMichael Ang <mang@archive.org>
Thu, 28 Jan 2010 01:35:03 +0000 (01:35 +0000)
committerMichael Ang <mang@archive.org>
Thu, 28 Jan 2010 01:35:03 +0000 (01:35 +0000)
commit43eb896b2982a6823fd47417f655a8076032bb44
tree5b0e1e6e1cc0e4d4930734d37d023e7f74ee16b4
parent4ef8393817afa5a462579ced4db342b5f5505aa2
parentbc0d5cedb8b4ea67b175979238585c690d62f091
Merge Internet Archive petabox-related changes

Merge branch 'traceychanges' into 0.9.20

Conflicts:
BookReaderIA/inc/BookReader.inc
BookReaderIA/www/BookReaderJSLocate.php
BookReaderIA/datanode/BookReaderJSIA.php
BookReaderIA/inc/BookReader.inc
BookReaderIA/www/BookReaderJSLocate.php