Merge branch 'wip-MDL-33156-master' of https://github.com/barbararamiro/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 12 Jun 2012 07:55:26 +0000 (15:55 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Jun 2012 07:55:26 +0000 (15:55 +0800)

Trivial merge