Merge branch 'MDL-34738' of git://github.com/jmvedrine/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 21 Aug 2012 01:39:50 +0000 (09:39 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 21 Aug 2012 01:39:50 +0000 (09:39 +0800)

Trivial merge