Merge branch 'MDL36874_Text_navigation_for_Books' of git://github.com/Dave-B/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 18 Nov 2014 13:54:05 +0000 (13:54 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 18 Nov 2014 13:54:05 +0000 (13:54 +0000)
commitc8b01e0c7d1ff638a3df32e2b186a54bc6ae58a3
tree27e7e16a136179f52bb7e8651df4f7a4c9fee431
parent0bd55a3322dd5ced2fc1d0491debbcc2929aa2c2
parentf4de84614379ac7e5d0df74c89cddb6585946884
Merge branch 'MDL36874_Text_navigation_for_Books' of git://github.com/Dave-B/moodle

Conflicts:
mod/book/version.php
mod/book/db/upgrade.php
lib/outputlib.php
lib/outputrenderers.php
mod/book/db/upgrade.php
mod/book/version.php