Merge branch 'MDL-39489_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 11 Jun 2013 07:41:11 +0000 (15:41 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 11 Jun 2013 07:41:11 +0000 (15:41 +0800)

Trivial merge