Merge branch 'MDL-46588-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Sep 2014 22:23:09 +0000 (00:23 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Sep 2014 22:23:09 +0000 (00:23 +0200)
commit26115c284ea86f93fa95ffa613070789454e73d6
tree079696044ad7fba94d590480e0036e82215bf0d5
parent5ce0af436d40e313bab6940c8347c8d7f977844d
parenteac1383edb5f294352b9d38c681700841ef421dd
Merge branch 'MDL-46588-master' of git://github.com/jleyva/moodle