Merge branch 'master_MDL-34644' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 18 Sep 2012 01:27:09 +0000 (09:27 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 18 Sep 2012 01:27:09 +0000 (09:27 +0800)

Trivial merge