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

Trivial merge