Git merges in Moodle 2.3.0 by Marina Glancy

commit 55711b0a0d25b48037930fd2e4195556ff08db33
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 21 May 2012 18:17:25 +0800
Tag:    v2.3.0-beta

Merge pull request #4 from mudrd8mz/wip-files23-fixes