Merge branch 'MDL-41125-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 22 Aug 2013 02:32:54 +0000 (10:32 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 22 Aug 2013 02:32:54 +0000 (10:32 +0800)

Trivial merge