Merge branch 'MDL-30165-master-1' of git://git.luns.net.uk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Nov 2011 10:22:50 +0000 (11:22 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Nov 2011 10:22:50 +0000 (11:22 +0100)
commit5535390c55240f82bd98828e3d0d97318feef1d7
tree93c112201e6a04d54f10ddab67ba6e112fd46e33
parent3a02133f3f86778d64a116fab7f560d6e15b782a
parent7633f4b55bda7c5bffb07358720a80f879a33bf9
Merge branch 'MDL-30165-master-1' of git://git.luns.net.uk/moodle