Merge branch 'MDL-28028' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jun 2011 18:58:27 +0000 (20:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jun 2011 18:58:27 +0000 (20:58 +0200)
commit76feb947b68edfc2fcc675d88508f4831c017b8d
tree528d2ddff84ba569add653c863538b5b666c0385
parentf0548d18bf213aad5a0126dbadf06dda9778de44
parentf997f0fc464be70c8906e1334df871f523e731be
Merge branch 'MDL-28028' of git://github.com/timhunt/moodle