Merge branch 'MDL-33121' of git://github.com/rwijaya/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 19 Jun 2012 06:14:54 +0000 (14:14 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 19 Jun 2012 06:14:54 +0000 (14:14 +0800)
commit34741af185965809a4f33417c7dbb53a0bbf7864
treec7f5f1b68155746652e5c0f77dd3bb876c50dd6b
parentc1ac8fa189cf1c129aa3b5bb450c50e87b868a22
parent0a5b9e79e38059ecb5a280a339fd680ae99418e8
Merge branch 'MDL-33121' of git://github.com/rwijaya/moodle
mod/book/locallib.php
mod/book/tool/exportimscp/version.php
mod/book/tool/importhtml/locallib.php
mod/book/tool/importhtml/version.php
mod/book/tool/print/version.php
mod/book/version.php