Merge branch 'MDL-56295-master' of git://github.com/andrewnicols/moodle
commitffe9505d2bd0009a59fce91df4359cfe40224130
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Oct 2016 18:02:22 +0000 (18 20:02 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Oct 2016 18:02:22 +0000 (18 20:02 +0200)
tree8978d4800df557da6debd9eb73563b328ae44385
parente74c54ec4d03b60e38136784c19767d181df6086
parent985ec993591d5a0d7af69fd500a8d10de05115c1
Merge branch 'MDL-56295-master' of git://github.com/andrewnicols/moodle
mod/book/delete.php
mod/book/lang/en/book.php
mod/book/locallib.php