Merge branch 'MDL-33536-master' of git://github.com/damyon/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 13 Nov 2013 05:10:42 +0000 (13:10 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 13 Nov 2013 05:10:42 +0000 (13:10 +0800)
commit2034716c164fcffb47f7dddc332617d6763f9688
treed75260b1e85f11eb7345ae754272d6cf431e147f
parentdb7092b07610af4f2cd1b6bd3146c9210abe8214
parent2b997ab5dd5e079b578f6ac8dc9fa5271f34e5dd
Merge branch 'MDL-33536-master' of git://github.com/damyon/moodle
lib/navigationlib.php