Merge branch 'MDL-30879-m22' of git://github.com/sammarshallou/moodle into MOODLE_22_...
commitdbc7d20cf56c78ceb649e24deee8b41cbb5151ca
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 4 Jan 2012 01:14:34 +0000 (4 02:14 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 4 Jan 2012 01:14:34 +0000 (4 02:14 +0100)
treec1cccf01a74c1b582a341c13879c94e4d391ac30
parent6357d61912bc84fe179a7344fe6bf21d85ecc391
parent1800b35bf686858a9624b6885077beae44fb1661
Merge branch 'MDL-30879-m22' of git://github.com/sammarshallou/moodle into MOODLE_22_STABLE