Merge branch 'MDL-44124-master' of git://github.com/ankitagarwal/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 23 Jun 2014 03:33:50 +0000 (11:33 +0800)
committerMarina Glancy <marina@moodle.com>
Mon, 23 Jun 2014 03:33:50 +0000 (11:33 +0800)

Trivial merge