Merge branch 'MDL-31122-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Jan 2012 00:52:25 +0000 (01:52 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Jan 2012 00:52:25 +0000 (01:52 +0100)
commitf8b8abcc5542529b7abfc344dca267fecbc51e6f
tree0696c3527b79a0ec60e378247994e07dcabf1178
parent8300d8894ce5d843b72ad127ce0d333f9f812816
parentd67e4821ab17495cd396d5aebffc121562c51d9f
Merge branch 'MDL-31122-master' of git://github.com/sammarshallou/moodle
lib/navigationlib.php