Merge branch 'MDL-42514-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 25 Oct 2013 07:27:48 +0000 (15:27 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 25 Oct 2013 07:27:48 +0000 (15:27 +0800)

Trivial merge