Merge branch 'MDL-30031' of git://github.com/bostelm/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Jan 2012 01:14:20 +0000 (02:14 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Jan 2012 01:14:20 +0000 (02:14 +0100)
commit30c99be2f0483aee84dfe1e44098a3228c9fd635
treee7c2616fd494a227f12c842fa27884fc5f88cb8a
parent0e743da2b484862c1ec95c18df4d940094347fe0
parent096c30165b18ebd4f4c5c03f3d2aa31ca161450a
Merge branch 'MDL-30031' of git://github.com/bostelm/moodle