Merge branch 'MDL-37485_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commite3a2abd60f734bceda2645c3454c23ffc49e6f8a
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Jan 2013 22:22:13 +0000 (14 23:22 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Jan 2013 22:22:13 +0000 (14 23:22 +0100)
treece853f275bf25074d19a7de6c0597088a75f650a
parentb09baf94b94519b6f7e0de0f4fb5162d20aeeb74
parent406f11ff7727ce0a66d5f49f7ebc12f8f9d55fa9
Merge branch 'MDL-37485_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE