Merge branch 'MDL-39776-master' of git://github.com/phalacee/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 9 Oct 2013 08:54:02 +0000 (16:54 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 9 Oct 2013 08:54:02 +0000 (16:54 +0800)

Trivial merge