Merge branch 'master_MDL-28603' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Aug 2011 18:00:53 +0000 (20:00 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Aug 2011 18:00:53 +0000 (20:00 +0200)
commit04a332d7402ce9aa5714a33371381a558e75133f
treedf280557a894593798e3f11540f94a2e88085d0d
parent22fb5386034a3e3c159c9b40cec3432c741cad61
parentf35b5884befabde5d69fbb85806b461a70b6b025
Merge branch 'master_MDL-28603' of git://github.com/danmarsden/moodle