Merge branch 'MDL-35321-master' of git://github.com/micaherne/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 25 Sep 2012 03:32:21 +0000 (11:32 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 25 Sep 2012 03:32:21 +0000 (11:32 +0800)

Trivial merge