Merge branch 'MDL-22153' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 10 Apr 2013 02:58:32 +0000 (10:58 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 10 Apr 2013 02:58:32 +0000 (10:58 +0800)

Trivial merge