Merge branch 'wip-MDL-33162-master' of git://github.com/barbararamiro/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 24 May 2012 08:10:06 +0000 (16:10 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 24 May 2012 08:10:06 +0000 (16:10 +0800)

Trivial merge