Merge branch 'wip-MDL-38441-m25' of git://github.com/samhemelryk/moodle
commitbdeda339b45a0a54072484378f165f16541ee714
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Apr 2013 21:41:47 +0000 (23 23:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Apr 2013 21:41:47 +0000 (23 23:41 +0200)
tree88af6fb1718c4670aae993200f2eb7031b383044
parent89275dcf80412a05aacd066538f67bc3ccc4bb96
parent067895801531d5aabca996d0c95041a80d09606c
Merge branch 'wip-MDL-38441-m25' of git://github.com/samhemelryk/moodle