Merge branch 'MDL-28193' of git://git.luns.net.uk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2011 23:29:27 +0000 (01:29 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2011 23:29:27 +0000 (01:29 +0200)
commit60ee61147d52ad3840e5e370b9e50369458f541d
tree2f57856f9ac482eb9ea641e52728b6f69f8fdfc4
parent9a160c7c466af89fdaae4ea0e0df4021bd982844
parentb7eceef75f4173f6384f1f2a82df008e63321ae1
Merge branch 'MDL-28193' of git://git.luns.net.uk/moodle