Merge branch 'MDL-35436' of https://github.com/raymondAntonio/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Oct 2012 22:36:00 +0000 (00:36 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Oct 2012 22:36:00 +0000 (00:36 +0200)
commitf503a3cd5c1b339e9771b5316fb2cc4eda1087c7
treeadb1eb330da7c84a5b7c763dd64d3d54fdbe6e98
parentec467d04d92c59f444c80e63553c20d3cea47c37
parent45a64c19bf2a38c4856de93d007c5a84375da7b4
Merge branch 'MDL-35436' of https://github.com/raymondAntonio/moodle