Merge branch 'wip-MDL-28407-master' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Aug 2011 23:10:27 +0000 (01:10 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Aug 2011 23:10:27 +0000 (01:10 +0200)
commitb16d8f59ab440e783ec0cb06f8b1ea09e4006ddb
tree75aa466e257e2bc9a8f20aedca042c238e78d64e
parent43c88235c54829c769990ea900b5452853da2318
parent683eb07144acdd849249b87c87c14beee32734dd
Merge branch 'wip-MDL-28407-master' of git://github.com/samhemelryk/moodle