Merge branch 'MDL-32981-master' of github.com:FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 May 2012 03:14:12 +0000 (11:14 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 22 May 2012 03:14:12 +0000 (11:14 +0800)
commit3e832fe3e5c903fd40691ae12f1ffed863787d8e
treedf48427a389631953e023f65a04728de38ddcb43
parentcba59b3d832fc7af00bf41a4d1eff8ae7c64bd4d
parentc598ea55fe41ac68003a0d60a1b414e0d8007343
Merge branch 'MDL-32981-master' of github.com:FMCorz/moodle
lib/navigationlib.php
user/filesedit.php