Merge branch 'MDL-29441-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Oct 2013 05:19:27 +0000 (13:19 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Oct 2013 10:11:48 +0000 (12:11 +0200)

Trivial merge