Merge branch 'MDL-38538_clean' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 3 Apr 2013 01:55:21 +0000 (09:55 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 3 Apr 2013 01:55:21 +0000 (09:55 +0800)

Trivial merge