Merge branch 'MDL-31345_master' of git://github.com/lazydaisy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Feb 2012 10:13:53 +0000 (11:13 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Feb 2012 10:13:53 +0000 (11:13 +0100)
commit4b192ea03920efd3458668286fb10980cc8dd366
treecac80f5381fd6db6590e6376ca516d011c823330
parent82b07ee7d39894bc9c7008a941b89a7b58b47bef
parent5d24254a9ded2c9a20304ecf0ecbfa3ef08f91d6
Merge branch 'MDL-31345_master' of git://github.com/lazydaisy/moodle