Merge branch 'MDL-44891-master' of git://github.com/sammarshallou/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 8 Apr 2014 03:13:17 +0000 (11:13 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 8 Apr 2014 03:13:17 +0000 (11:13 +0800)

Trivial merge