Merge branch 'MDL-39198_master' of git://github.com/kordan/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 May 2013 03:47:50 +0000 (11:47 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 20 May 2013 03:47:50 +0000 (11:47 +0800)

Trivial merge