Merge branch 'MDL-36856' of git://github.com/kastashov/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 10 Dec 2012 06:04:22 +0000 (14:04 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 10 Dec 2012 06:04:22 +0000 (14:04 +0800)

Trivial merge