Merge branch 'MDL-33028' of git://github.com/mouneyrac/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 25 May 2012 02:22:35 +0000 (10:22 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 25 May 2012 02:22:35 +0000 (10:22 +0800)

Trivial merge