Merge branch 'master' into newui
authorMichael Ang <mang@archive.org>
Mon, 4 Oct 2010 21:35:29 +0000 (21:35 +0000)
committerMichael Ang <mang@archive.org>
Mon, 4 Oct 2010 21:35:29 +0000 (21:35 +0000)
commit9241e12bf5899f26550af4dbcbcb737395850193
tree4f835cdb74ed0901afb23264467dfb4589ffd364
parentd71a231828fe68a3f2b8de067b5b4b64ce916e6e
parent6e1ee548edf612eb42edebc5525e23a43b9b0499
Merge branch 'master' into newui

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