Merge branch 'MDL-48660-master' of https://github.com/sammarshallou/moodle
commit7615deba22cfae9076a79fc8ce902b24815c1fff
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Jan 2015 20:11:27 +0000 (27 21:11 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Jan 2015 20:11:27 +0000 (27 21:11 +0100)
tree9381b898c709c15a0e292e98c8e0bc0cd93f52ca
parent8072628a6726b262c425e2d515feadbb83459454
parent6b40e5b2ecefd0fb400e393b012f1e1ed595c7a9
Merge branch 'MDL-48660-master' of https://github.com/sammarshallou/moodle