Merge branch 'MDL-37656_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 Jan 2013 05:46:26 +0000 (13:46 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 29 Jan 2013 05:46:26 +0000 (13:46 +0800)

Trivial merge