Merge branch 'MDL-38197-master' of git://github.com/sammarshallou/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 20 Aug 2013 06:55:07 +0000 (14:55 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Aug 2013 06:55:07 +0000 (14:55 +0800)

Trivial merge