Merge branch 'MDL-41966-master' of git://github.com/ankitagarwal/moodle
commit7419751a4c05d32144474c6e98288f6ed7e8376a
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Oct 2013 23:09:25 +0000 (25 01:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Oct 2013 23:09:25 +0000 (25 01:09 +0200)
tree7c9d1a6ee5ac5ffd9e3a8c30ff1fe6c3b2b3b48a
parent20ddc0c9cfbfcde9d807a50f33d5d696d8b61b39
parentc3faa40f0b363a1ff777f2d8e753079bf8aa310d
Merge branch 'MDL-41966-master' of git://github.com/ankitagarwal/moodle