From: Michael Ang Date: Fri, 8 Oct 2010 00:12:34 +0000 (+0000) Subject: Merge branch 'master' into newui X-Git-Url: http://git.rot13.org/?p=bookreader.git;a=commitdiff_plain;h=660ca11e9aab51d83c78202e8beed414b88d38df Merge branch 'master' into newui Conflicts: BookReaderIA/inc/BookReader.inc --- 660ca11e9aab51d83c78202e8beed414b88d38df