Merge branch 'MDL-38634' of git://github.com/rlorenzo/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 8 Apr 2013 03:55:55 +0000 (11:55 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 8 Apr 2013 03:55:55 +0000 (11:55 +0800)

Trivial merge