Merge branch 'MDL-28183' of git://github.com/jmvedrine/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 8 Jan 2013 04:17:51 +0000 (12:17 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Jan 2013 04:17:51 +0000 (12:17 +0800)

Trivial merge