Merge branch 'MDL-53671-master' of git://github.com/dpalou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Apr 2016 21:57:21 +0000 (23:57 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Apr 2016 21:57:21 +0000 (23:57 +0200)
1  2 
mod/book/lib.php

Simple merge