Merge branch 'MDL-29691' of https://github.com/ppichet/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 Jan 2013 08:30:00 +0000 (16:30 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 29 Jan 2013 08:30:00 +0000 (16:30 +0800)

Trivial merge