Merge branch 'MDL-38570-master' of https://github.com/timgus/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 10 Sep 2013 03:13:29 +0000 (11:13 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 10 Sep 2013 03:13:29 +0000 (11:13 +0800)

Trivial merge