Merge branch 'MDL-36104_master' of https://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Jan 2013 00:11:48 +0000 (01:11 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Jan 2013 00:11:48 +0000 (01:11 +0100)
commit0aaf378cf958fca34534ee45138d204ccc5dd778
tree3f7b26ebb542d4c9b3ed515988436bbc85cc9abd
parent17f394f81a8990471a835ecae941c38194e797bf
parent7e5be0744cd92994001110096b51fd7aa89911db
Merge branch 'MDL-36104_master' of https://github.com/markn86/moodle