Merge branch 'MDL-42021-master' of git://github.com/FMCorz/moodle
commit268f4cb5038a7de8bbed6c0fe098c214d6922297
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Oct 2013 18:08:25 +0000 (1 20:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Oct 2013 19:36:13 +0000 (1 21:36 +0200)
tree6965ed85f2695d36890ad08a282801347a30f00f
parent7f58018843213a81626e5b439da6b08dea4b1ccc
parent31e571cdf0dd30f5c9c090d956a4ffe3889d3139
Merge branch 'MDL-42021-master' of git://github.com/FMCorz/moodle