Merge branch 'MDL-32279' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 15 Jun 2012 03:02:47 +0000 (11:02 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 15 Jun 2012 03:02:47 +0000 (11:02 +0800)

Trivial merge