Merge branch 'MDL-32998' of git://github.com/mouneyrac/moodle
commit3e632cf4e603c30ba57ddf9660c4e100ad23d92e
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 May 2012 11:14:13 +0000 (15 13:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 May 2012 11:14:13 +0000 (15 13:14 +0200)
tree33f223d86db6711c7a270e2d0dc60578d56a1064
parent5b0800d30e426377a05b1864232aeafed6db4dc3
parent50f9449faa6d410a304ffb6ae24368c51f975306
Merge branch 'MDL-32998' of git://github.com/mouneyrac/moodle