Merge branch 'MDL-32309-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 19 Sep 2012 08:10:50 +0000 (16:10 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 19 Sep 2012 08:10:50 +0000 (16:10 +0800)

Trivial merge