Merge branch 'master' into newui
authorMichael Ang <mang@archive.org>
Fri, 8 Oct 2010 00:12:34 +0000 (00:12 +0000)
committerMichael Ang <mang@archive.org>
Fri, 8 Oct 2010 00:12:34 +0000 (00:12 +0000)
commit660ca11e9aab51d83c78202e8beed414b88d38df
tree4101486a3de0bf4b3a3967c06d39575a829f94bc
parent78fafb842fe4b5a90714a07fb9855aab30d799ca
parentde897e59ba78a369a1bf272dc0a721de95df1a13
Merge branch 'master' into newui

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