Merge branch 'MDL-33400' of git://github.com/nebgor/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 14 Jun 2012 02:27:23 +0000 (10:27 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 14 Jun 2012 02:27:23 +0000 (10:27 +0800)

Trivial merge