Merge branch 'MDL-46281-master' of git://github.com/lucisgit/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 19 Aug 2014 08:26:35 +0000 (16:26 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 19 Aug 2014 08:26:35 +0000 (16:26 +0800)
commit4cb61b6b4e30f0b3385241fe9c07040ae3d197cc
treee0455791712beb48fcff99f4da3812227b4b576f
parentfc9b567f328e73d97fb203e55143a4ae419ba582
parent206541a12cac8827c5c05a268c35bf7362f09fed
Merge branch 'MDL-46281-master' of git://github.com/lucisgit/moodle