Merge branch 'MDL-42604-master' of git://github.com/ankitagarwal/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 4 Nov 2013 08:16:23 +0000 (19:16 +1100)
committerMarina Glancy <marina@moodle.com>
Mon, 4 Nov 2013 08:16:23 +0000 (19:16 +1100)

Trivial merge