Merge branch 'master_MDL-28016' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jun 2011 23:10:51 +0000 (01:10 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jun 2011 23:10:51 +0000 (01:10 +0200)
commitca2b89d5dfb7e62fb7be797ac7bde2d794fdf752
treec63dd2be6cd12733f974c7eb0264041533845aca
parenta092e9bc42f65a63a5873029577dda006b2db0af
parent444ff001a1a8fc3a2bb6d2789ebfcd01453fa344
Merge branch 'master_MDL-28016' of git://github.com/danmarsden/moodle