Merge branch 'MDL-35026_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commite5783fd132e9147aacefcfa6a3feee5bba1ea4f3
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 15:54:55 +0000 (27 17:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 15:54:55 +0000 (27 17:54 +0200)
tree201c44d9d94158385fc231ee0d9911a5ed06ad2c
parent70c160f27df55ebe6d7f050f47a188ec7b9a62cd
parent1482c2b20b625bd2afa921561b1b316b803eb3ce
Merge branch 'MDL-35026_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE