Merge branch 'MDL-35133_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commit8918cf7b0d94584d6596f5849f43c677e7aaa2c5
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Sep 2012 15:48:12 +0000 (3 17:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Sep 2012 15:48:12 +0000 (3 17:48 +0200)
treec314865aa0afa37238eed36a5929b7fe6af2f72e
parentd7831c74bef1cf07351850899ea4689d04d6800e
parentb8c475d63122b136945129ff2dbf39b86974dd75
Merge branch 'MDL-35133_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE