Merge branch 'MDL-39954-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 14 Aug 2013 07:38:37 +0000 (15:38 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Aug 2013 07:38:37 +0000 (15:38 +0800)

Trivial merge