Merge branch 'MDL-30042-master-1' of git://git.luns.net.uk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Nov 2011 02:06:18 +0000 (03:06 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Nov 2011 02:06:18 +0000 (03:06 +0100)
commita0d26f45f7366ee886697900ec4c5f968e8fbb15
treed9e176403aa6dc95288e4c5c6174d214cfa59610
parent7722bb5df804b2c3843ed1698eb76198e7f52eda
parent2a420f5cd4edef189d9fa646357be3015ca9430b
Merge branch 'MDL-30042-master-1' of git://git.luns.net.uk/moodle