Merge branch 'MDL-30851_22_wip' of git://github.com/grabs/moodle into MOODLE_22_STABLE
commit58a44ab2281f487380658f86e5faecd51731c2af
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Jan 2012 19:26:40 +0000 (2 20:26 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Jan 2012 19:26:40 +0000 (2 20:26 +0100)
treed8af4360bdee60d0a289588ae2fdf947f0be10e3
parentb43c2e9d397b8c3bd19e2ebf45e2481e794ded75
parent9d1963b42139b3108be0100ae46ed82d9776fc68
Merge branch 'MDL-30851_22_wip' of git://github.com/grabs/moodle into MOODLE_22_STABLE