Merge branch 'MDL-41328-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 2 Sep 2013 03:44:51 +0000 (11:44 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 2 Sep 2013 03:44:51 +0000 (11:44 +0800)

Trivial merge