Merge branch 'MDL-41292-master' of git://github.com/mr-russ/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Dec 2013 01:23:08 +0000 (02:23 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Dec 2013 01:23:08 +0000 (02:23 +0100)
commitbb0746c985f97f7baaaf871c286f4d4a7acad4e8
tree5d5864f072a65ea9fe53d922c683e7ef3ded1a14
parent5d2667fa077a7a0031d26b8132d8a98d636e4c66
parent0dd7c711c57adca9dc19f563cd05a4d5bb7be7ee
Merge branch 'MDL-41292-master' of git://github.com/mr-russ/moodle