Merge branch 'MDL-34783-master-1' of git://git.luns.net.uk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Aug 2012 20:45:06 +0000 (22:45 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Aug 2012 20:45:06 +0000 (22:45 +0200)
commit92886a8e1405d5abc82dbf56fed82229513c5aee
tree231d8d29d01ca9b59c405cfac42bcdcc593984b1
parent50f0c35dd3d2d4597e2f39672471b1010f036ed0
parent49ed1b0d0b9bc49365e7a5c3511114e31b3d5748
Merge branch 'MDL-34783-master-1' of git://git.luns.net.uk/moodle