Merge branch 'MDL-28301-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Aug 2011 22:56:28 +0000 (00:56 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Aug 2011 22:56:28 +0000 (00:56 +0200)
commit8b321291e2821543d03a6d1cec7217f1af4d2928
treea607a84b235d19481af0e12539fa7a059fdd6871
parenta50fe03ebe72ff7f14129341a34df19dde72bb17
parent26848c48f9462ebc1bf26bca14ad50a45be837c1
Merge branch 'MDL-28301-master' of git://github.com/sammarshallou/moodle