Merge branch 'MDL-26365' of git://github.com/timhunt/moodle
commitbcbb59022708b042a4a36501a12ea3897e455384
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Feb 2011 00:03:23 +0000 (15 01:03 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Feb 2011 00:03:23 +0000 (15 01:03 +0100)
tree7c1e47a90220c2e3cd7c19efa53dbf4146f641d2
parent46388c9cf97e9e67f705dd08369cd547307d8516
parent5ec3e4a8eb6f8c91701c5311eb549cac7193ed8b
Merge branch 'MDL-26365' of git://github.com/timhunt/moodle