Merge branch 'wip-MDL-32975-m25' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Mar 2013 22:03:46 +0000 (23:03 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Mar 2013 22:47:13 +0000 (23:47 +0100)
commit267325491917da9e6ff27062e8476f967f6b48d4
treea6bb5b07d0284d8106d6032f2fce8e29492527f9
parented2703290cdcdd041a002406ab4218bbe14fdaf4
parentf87ce4e9a09acb27c4189552d56a97597910a096
Merge branch 'wip-MDL-32975-m25' of git://github.com/samhemelryk/moodle
lib/navigationlib.php