Merge branch 'wip-MDL-36398-master' of git://github.com/barbararamiro/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 13 Nov 2012 04:57:30 +0000 (12:57 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 13 Nov 2012 04:57:30 +0000 (12:57 +0800)

Trivial merge