Merge branch 'MDL-48443-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 23 Mar 2015 15:03:56 +0000 (15:03 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 23 Mar 2015 15:03:56 +0000 (15:03 +0000)

Trivial merge