Merge branch 'MDL-41759-master' of https://github.com/jamiepratt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Feb 2014 14:45:01 +0000 (15:45 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Feb 2014 14:45:01 +0000 (15:45 +0100)
commit1f09c262980f37156cd0d44aa71614a6866ed3ca
treeb9fc4e283e55adffde775838dcc3a7afebdc8b55
parenta0cb27f72a5d5bb91c94c41548b36a935ec3f825
parent9d3d859c7f6566e6eb57b284cf60a074e4386fbd
Merge branch 'MDL-41759-master' of https://github.com/jamiepratt/moodle