Merge branch 'MDL-28705_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 04:54:28 +0000 (12:54 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 04:54:28 +0000 (12:54 +0800)

Trivial merge