Merge branch 'wip-MDL-38075-m25' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Feb 2013 23:07:17 +0000 (00:07 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Feb 2013 23:07:17 +0000 (00:07 +0100)
commit4e6bb9d315dbcb78aac026e4dc45b69f9ab9d1ea
treee2101bb13659062bfc3fada427e6b0f33ae7c094
parent80ba3a43902af16d72f849c4d153150fa198aa40
parent95cf54e1c9b185713f7d0b560e845c93214f7e07
Merge branch 'wip-MDL-38075-m25' of git://github.com/samhemelryk/moodle