Merge branch 'MDL-40055-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 26 Aug 2013 07:09:33 +0000 (15:09 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 26 Aug 2013 07:09:33 +0000 (15:09 +0800)

Trivial merge