Merge branch 'MDL-42891-master' of git://github.com/ankitagarwal/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 2 Apr 2014 06:54:59 +0000 (14:54 +0800)
committerMarina Glancy <marina@moodle.com>
Wed, 2 Apr 2014 06:54:59 +0000 (14:54 +0800)

Trivial merge