Merge branch 'MDL-39753' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 21 May 2013 02:58:37 +0000 (10:58 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 21 May 2013 02:58:37 +0000 (10:58 +0800)

Trivial merge