Merge branch 'MDL-30106' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 6 May 2014 02:25:48 +0000 (10:25 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 6 May 2014 02:25:48 +0000 (10:25 +0800)

Trivial merge