Merge branch 'MDL-40285_master' of git://github.com/markn86/moodle
commitf271b113a6c51dbe22c9a8a5aace0b66ef81c952
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Jan 2015 11:09:58 +0000 (27 12:09 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Jan 2015 11:09:58 +0000 (27 12:09 +0100)
tree49341be8b95ceae00b3b0ddde7909ea280fd1deb
parent61b31b4e1088ac36055fa2e9c9960d62c5bfd447
parentd2e1c5f5fc5c68e46575dac8505f58168d2401b7
Merge branch 'MDL-40285_master' of git://github.com/markn86/moodle