Merge branch 'MDL-31983-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 Feb 2013 07:54:22 +0000 (15:54 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 18 Feb 2013 07:54:22 +0000 (15:54 +0800)

Trivial merge