Merge branch 'wip-MDL-30997-master' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 22 Feb 2012 12:09:54 +0000 (13:09 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 22 Feb 2012 12:09:54 +0000 (13:09 +0100)
commit202c72c997f3e9ef4248f1277622439785138d88
tree38ad12e87ad98103e0dbb01d408c6a9d67a61662
parent75e4f98c0dffa91508c6e72985b30295cf9cb45e
parent4d8e24174283e2fde4972b7640340cec54fc013f
Merge branch 'wip-MDL-30997-master' of git://github.com/abgreeve/moodle