Merge branch 'MDL-26266' of git://github.com/samhemelryk/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 7 Feb 2011 22:05:08 +0000 (23:05 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 7 Feb 2011 22:05:08 +0000 (23:05 +0100)
1  2 
lib/navigationlib.php

Simple merge