Merge thumbnail view feature contributed by scollett
authorMichael Ang <mang@archive.org>
Tue, 9 Mar 2010 23:55:37 +0000 (23:55 +0000)
committerMichael Ang <mang@archive.org>
Tue, 9 Mar 2010 23:55:37 +0000 (23:55 +0000)
commit8a6d3aa388feb1a21e59516e46d3f6dbd23b743d
treebee47d8f9d829d51f2cd81d0ef4e0af39c60be89
parent5abbc673ee16c965b575bd46309dd0dcd67c2143
parentdfb5a3ab7ef6be1a92ecbfd65935534980e6ff7d
Merge thumbnail view feature contributed by scollett

Merge commit 'scollett/master' into 0.9.22

Conflicts:
BookReader/BookReader.js
BookReader/BookReader.js