Merge branch 'master' of https://github.com/tniessen/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 10 Apr 2017 05:16:29 +0000 (13:16 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 10 Apr 2017 05:16:29 +0000 (13:16 +0800)
1  2 
mod/book/lib.php

Simple merge