Merge branch 'master' into newui
authorMichael Ang <mang@archive.org>
Wed, 10 Nov 2010 19:54:44 +0000 (19:54 +0000)
committerMichael Ang <mang@archive.org>
Wed, 10 Nov 2010 19:54:44 +0000 (19:54 +0000)
commit918094a50225509e6c2687a691c5f8534fe23c9a
tree2996ef718395b27ba6407437ccf4e057dec96cda
parente4cbc11a7e4ceb1bbc20aad1bde377ac35faa95c
parent5a18f3d0029e286ab14d501c477df71aa66d595b
Merge branch 'master' into newui

Conflicts:
BookReaderIA/inc/BookReader.inc
BookReaderIA/inc/BookReader.inc