Merge branch 'MDL-43987-master' of git://github.com/xow/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Nov 2014 13:17:40 +0000 (13:17 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Nov 2014 13:17:40 +0000 (13:17 +0000)

Trivial merge