Merge branch '48374-29' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Dec 2014 23:10:41 +0000 (00:10 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 4 Dec 2014 12:04:09 +0000 (12:04 +0000)
commit951af91e083b3049ba13f8fceda7c5685251afd8
tree7499e8f5806e51e8ffa60e4869b412a77aeec86d
parent3d891e3263d406eae858cdad89c577e1e42b47d0
parenta33fed2161c7a544df3e0c99afacb5180e9a9fc4
Merge branch '48374-29' of git://github.com/samhemelryk/moodle