Merge branch 'MDL-37574-m' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Feb 2013 08:11:11 +0000 (16:11 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Feb 2013 08:11:11 +0000 (16:11 +0800)
commit78b161d39b7b0672d4c75e8cb2c2a263273cb7ea
treebfb5a0d0965746603040b17a07045b851e5a9a52
parent58e22287a6c8974fb1499f3a46bf7ef324baa3e4
parent2f545feb89019bef0a8dc554d2428ed96bd32674
Merge branch 'MDL-37574-m' of git://github.com/andrewnicols/moodle
lib/navigationlib.php