Merge branch 'MDL-42704-master' of git://github.com/jamiepratt/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 8 Nov 2013 03:11:28 +0000 (11:11 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 8 Nov 2013 03:11:28 +0000 (11:11 +0800)

Trivial merge