Merge branch 'MDL-56293-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Oct 2016 17:08:08 +0000 (19:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Oct 2016 17:08:08 +0000 (19:08 +0200)
1  2 
mod/book/locallib.php

Simple merge