Merge branch 'MDL-28996' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 08:41:17 +0000 (10:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 08:41:17 +0000 (10:41 +0200)
commit4abd7a07e1972af0ad38fb70b453fcf973e5eca9
tree2b1283bc1a488db9576c920d084a8aeb634a3209
parent6c29e785eb6e6255f180a777d733177cbe370986
parenta47a46f13626e97613d03821d0ce3c8c44402a4b
Merge branch 'MDL-28996' of git://github.com/timhunt/moodle