Merge branch 'MDL-35673-master' of git://git.luns.net.uk/moodle
commit2aeb0fbb600be9ebdce23cdb5cd20d8a4b58497b
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Oct 2012 07:55:20 +0000 (2 09:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Oct 2012 07:55:20 +0000 (2 09:55 +0200)
tree43da2c6267707a085a2dc619c0d9cd0eb8e3b960
parent001d5a034c42a218c3d386c2da01ad38ba843966
parentd6418e531dcb02db6a98fc88c76c7c7bf2834b61
Merge branch 'MDL-35673-master' of git://git.luns.net.uk/moodle