Merge branch 'wip-MDL-39286-master' of git://github.com/ds125v/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 2 Dec 2013 07:16:12 +0000 (15:16 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 2 Dec 2013 07:16:12 +0000 (15:16 +0800)
commit2a1e730eb3bb4271449819284f83d39b738c661a
tree32161ef547545b9faf5b509c543b8ec944458cfd
parent2b267d31c8e6077c441d28f2d612d465ce5f7ec9
parent8b79059480935160a7ef0b9d767a4fc2a5532b39
Merge branch 'wip-MDL-39286-master' of git://github.com/ds125v/moodle
lib/navigationlib.php