Merge branch 'MDL-44596-master' of git://github.com/ankitagarwal/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 26 Mar 2014 02:01:06 +0000 (10:01 +0800)
committerMarina Glancy <marina@moodle.com>
Wed, 26 Mar 2014 02:01:06 +0000 (10:01 +0800)

Trivial merge