Merge branch 'MDL-34209-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Oct 2013 05:58:14 +0000 (13:58 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Oct 2013 05:58:14 +0000 (13:58 +0800)

Trivial merge