Merge branch 'MDL-40110_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Jun 2013 09:02:11 +0000 (17:02 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Jun 2013 09:02:11 +0000 (17:02 +0800)

Trivial merge