Merge branch 'MDL-34904-master' of git://github.com/ankitagarwal/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 5 May 2014 09:41:01 +0000 (17:41 +0800)
committerMarina Glancy <marina@moodle.com>
Mon, 5 May 2014 09:41:01 +0000 (17:41 +0800)

Trivial merge