Merge branch 'wip-MDL-38162-m25' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Feb 2013 00:28:56 +0000 (01:28 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Feb 2013 00:28:56 +0000 (01:28 +0100)
commitfd6e1aaadbbe27b0a8797f5a3ad7f09e12e9f6ab
tree86df6ccddafbc9865e940099e477ffdfef624cc8
parent64870338c44fa25bb3816bd212f10629703702d9
parentff6f9d3aa64ff8a0cde037f8b6342352ea818c45
Merge branch 'wip-MDL-38162-m25' of git://github.com/samhemelryk/moodle