Merge branch 'master_MDL-28541' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Aug 2011 23:26:34 +0000 (01:26 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Aug 2011 23:26:34 +0000 (01:26 +0200)
commit21507599b1d790a8d26624275968f3b458a7dd76
treedc351d7b84893ba80cf2c5c0cb02c116532eedd7
parentc380fbf4c9f76b29fcfbd766b72b5ad50053b978
parent6faea458ba7f3ca6363bb79fae0314e78cee79f5
Merge branch 'master_MDL-28541' of git://github.com/danmarsden/moodle