Merge branch 'MDL-32454-master-1' of git://git.luns.net.uk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Apr 2012 23:47:14 +0000 (01:47 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Apr 2012 23:47:14 +0000 (01:47 +0200)
commit434fc13dbec8348d42a1988bdf9eff1e7d5d2bf7
tree3198cb749409fbe02e567f8dcad76c6a1699ba9d
parent55a0c2d787d888aab1f22b8e613606f92aed216a
parent8219502369c3ed9319072e383063f03d065245d4
Merge branch 'MDL-32454-master-1' of git://git.luns.net.uk/moodle