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)
1  2 
lib/navigationlib.php

Simple merge