Merge branch 'MDL-25853-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Feb 2013 02:12:54 +0000 (10:12 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Feb 2013 02:12:54 +0000 (10:12 +0800)

Trivial merge