Merge branch 'MDL-32217' of git://github.com/ppichet/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 11 Apr 2012 01:27:29 +0000 (09:27 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 11 Apr 2012 01:27:29 +0000 (09:27 +0800)

Trivial merge