Merge branch 'MDL-33105' of https://github.com/ppichet/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 18 Jun 2013 02:35:47 +0000 (10:35 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 18 Jun 2013 02:35:47 +0000 (10:35 +0800)

Trivial merge