Merge branch 'MDL-38855_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 3 Apr 2013 04:44:05 +0000 (12:44 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 3 Apr 2013 04:44:05 +0000 (12:44 +0800)

Trivial merge