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

Trivial merge