Merge branch 'MDL-45409-master' of git://github.com/ankitagarwal/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 6 May 2014 04:19:58 +0000 (12:19 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 6 May 2014 04:19:58 +0000 (12:19 +0800)

Trivial merge