Merge branch 'MDL-36708-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 05:55:50 +0000 (13:55 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 05:55:50 +0000 (13:55 +0800)

Trivial merge