Merge commit 'origin/master' into mangprint
authorMichael Ang <mang@archive.org>
Tue, 15 Sep 2009 21:38:00 +0000 (21:38 +0000)
committerMichael Ang <mang@archive.org>
Tue, 15 Sep 2009 21:38:00 +0000 (21:38 +0000)
commit25a89ecea60b015a1b2b249463fd16ee15ab7030
tree6c82590996b70dbe9df0cd30fd47a4c957cbde3b
parente76716f64db0efe9547fa7e0b4c038c6795d52c8
parent55fe5aec6da8bf252ddc3f3e091e4035d2f43c72
Merge commit 'origin/master' into mangprint

Update print code with latest from mainline development

Conflicts:
GnuBook/GnuBook.js
GnuBook/GnuBookEmbed.css
GnuBook/GnuBook.css
GnuBook/GnuBook.js
GnuBook/GnuBookEmbed.css
GnuBookIA/www/GnuBookJSLocate.php
GnuBookIA/www/GnuBookPrint.php