Merge branch 'MDL-43619-master' of git://github.com/sammarshallou/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 15 Jan 2014 00:19:49 +0000 (08:19 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 15 Jan 2014 00:19:49 +0000 (08:19 +0800)

Trivial merge