Merge branch 'MDL-30209' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Nov 2011 23:02:02 +0000 (00:02 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Nov 2011 23:02:02 +0000 (00:02 +0100)
commit7f8dc336aab81f7d1936c3ee40b5e8f0c2038f3c
treed267787c441b42e92c453efbf7f7e5f5198d9c05
parent69f9e7f3e48102052b3024da68075033ba88e493
parent7238cd2ef0f51fe39478fe5dd7493cc675a50711
Merge branch 'MDL-30209' of git://github.com/timhunt/moodle