Merge branch 'MDL-44991-master' of git://github.com/sammarshallou/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 23 Apr 2014 05:24:54 +0000 (13:24 +0800)
committerMarina Glancy <marina@moodle.com>
Wed, 23 Apr 2014 05:24:54 +0000 (13:24 +0800)

Trivial merge