Merge branch 'MDL-40686' of git://github.com/rwijaya/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 10 Sep 2013 05:39:01 +0000 (13:39 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 10 Sep 2013 05:39:01 +0000 (13:39 +0800)
commite025a2fc43455ccef662f8e8abd1159e72902a17
tree7e31aab81affabddf71c48d155ad860a56f2bd1b
parentf1f4a860c65ad1926465683a17eff7170bfd1163
parentd8a6d49c5f9973f79ce265d1c1292b12db40333b
Merge branch 'MDL-40686' of git://github.com/rwijaya/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css
mod/book/view.php