Merge branch 'MDL-43730-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 22 Dec 2014 16:34:48 +0000 (16:34 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 22 Dec 2014 16:34:48 +0000 (16:34 +0000)

Trivial merge