Merge branch 'MDL-49242-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Mar 2015 23:11:56 +0000 (00:11 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Mar 2015 23:11:56 +0000 (00:11 +0100)
commit338de2ed78beb72b1f93d610593d97cb9cf75721
tree862f8156c5ab1a6e5401c88dd3b5d09c5a421334
parent9be958e2f0e065db4b3df017005122f30202d6c8
parent8a5346a7f1302c209b1da2b125e6282b34b25ea3
Merge branch 'MDL-49242-master' of git://github.com/jleyva/moodle