Merge branch 'MDL-40893-master' of https://github.com/mr-russ/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 19 Aug 2013 06:50:01 +0000 (14:50 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 19 Aug 2013 06:50:01 +0000 (14:50 +0800)

Trivial merge