Merge branch 'MDL-34259-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 6 Aug 2012 04:21:24 +0000 (12:21 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 6 Aug 2012 04:21:24 +0000 (12:21 +0800)

Trivial merge