Merge branch 'master_MDL-34440' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 31 Jul 2012 02:06:57 +0000 (10:06 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 31 Jul 2012 02:06:57 +0000 (10:06 +0800)

Trivial merge