Merge branch 'MDL-47763-master' of git://github.com/damyon/moodle
commit65504187d87b934916d0cee20b730d89e731aa2d
authorMarina Glancy <marina@moodle.com>
Thu, 23 Oct 2014 07:42:46 +0000 (23 15:42 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Oct 2014 09:48:06 +0000 (24 11:48 +0200)
treeb6282259806aaddf79a4b51d1c65b2404d36b763
parent2c89eeeb8ee6f30f6432a4077bf9bb9466b44ff4
parentedffadfd1ce69077f6625c4cebff3f9512784a96
Merge branch 'MDL-47763-master' of git://github.com/damyon/moodle