Merge branch 'MDL-44749-master' of git://github.com/andrewnicols/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 2 Apr 2014 01:56:46 +0000 (09:56 +0800)
committerMarina Glancy <marina@moodle.com>
Wed, 2 Apr 2014 01:56:46 +0000 (09:56 +0800)

Trivial merge