Merge branch 'MDL-44065-master' of https://github.com/sammarshallou/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 5 Mar 2014 02:52:46 +0000 (10:52 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 5 Mar 2014 02:52:46 +0000 (10:52 +0800)

Trivial merge