Merge branch 'wip-MDL-23626-master' of git://github.com/samhemelryk/moodle
authorPetr Skoda <commits@skodak.org>
Tue, 2 Aug 2011 13:48:20 +0000 (15:48 +0200)
committerPetr Skoda <commits@skodak.org>
Tue, 2 Aug 2011 13:48:20 +0000 (15:48 +0200)
1  2 
lib/navigationlib.php

Simple merge