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

Trivial merge