Merge branch 'MDL-46079-master' of https://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jun 2014 23:32:11 +0000 (01:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jun 2014 23:32:11 +0000 (01:32 +0200)
commit8b8c78946fed015e01052ba3dbff6ed83ce538f3
treee47329a4a7c24aabefd73fa338988429639ba7c2
parent025fa4fc740220bf92a281a36ffc9855e0b3494c
parent9f7b688c636d6c22f81f1fc580b36d4c83d87832
Merge branch 'MDL-46079-master' of https://github.com/sammarshallou/moodle