Merge branch 'MDL-31122-m22' of git://github.com/sammarshallou/moodle into MOODLE_22_...
commitb292cea475d1d0a3a2b7dbf67cd56782b14f0230
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Jan 2012 00:52:36 +0000 (25 01:52 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Jan 2012 00:52:36 +0000 (25 01:52 +0100)
tree273b2df1e78f8ffc5e34f10a8e1557b3bf8d91d3
parentfe3130a07d05c43df7c1b7dd7de6de052f16471d
parent54b1dc4950b406a8e3cd9d2b5aae4e71af85bf85
Merge branch 'MDL-31122-m22' of git://github.com/sammarshallou/moodle into MOODLE_22_STABLE
lib/navigationlib.php