Merge branch 'MDL-38821_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 2 Apr 2013 11:54:46 +0000 (19:54 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 2 Apr 2013 11:54:46 +0000 (19:54 +0800)

Trivial merge