Merge branch 'MDL-32061-master-2' of git://git.luns.net.uk/moodle
commit099aaa8d51fd85dd15c1e1b9f3fb679287e620f2
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Apr 2012 00:31:47 +0000 (18 02:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Apr 2012 00:31:47 +0000 (18 02:31 +0200)
treec9fc5b6a964b54fcfcfb1bc097a6525366ef9d9f
parent80695b2d5116a78e5ae30f700593b863bb170156
parent38a8779d81576cf792625dde9c6761e8c4b3a2b4
Merge branch 'MDL-32061-master-2' of git://git.luns.net.uk/moodle