Merge branch 'MDL-35003_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commit70c160f27df55ebe6d7f050f47a188ec7b9a62cd
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 15:51:41 +0000 (27 17:51 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 15:51:41 +0000 (27 17:51 +0200)
tree1a9d07435c021c8afaf5c91d5380f8cdfa555959
parentc06b18a47554bbb4ebeb815ba46db70972619db9
parentd9c2ecc34233bfc683e422b35eb0eaf7ba83cc05
Merge branch 'MDL-35003_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE