Merge branch 'MDL-29348-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE
commit0f43c243859fc8a465d859fe66be39f1cd77d820
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Sep 2012 00:23:16 +0000 (11 02:23 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Sep 2012 00:23:16 +0000 (11 02:23 +0200)
tree11a4fc25b02fe998bdc4e2a6d28d930272e4d280
parentb818dfc2d7e3c316b4a00b884bade3e7c625c7b5
parentb04ba378642353e224a34f77023d7f975a0c1a2e
Merge branch 'MDL-29348-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE