Dan Poltawski c8b01e0c7d Merge branch 'MDL36874_Text_navigation_for_Books' of git://github.com/Dave-B/moodle
Conflicts:
	mod/book/version.php
	mod/book/db/upgrade.php
2014-11-18 13:54:05 +00:00
..
2014-11-06 12:05:32 +08:00