Merge branch 'MDL-34887' of git://github.com/raymondAntonio/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 21 Aug 2012 02:53:53 +0000 (10:53 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 21 Aug 2012 02:53:53 +0000 (10:53 +0800)

Trivial merge