Merge branch 'm20_MDL-29213' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE
commit3db86da7bb531ae1bcbe416c60ee14a842d0036e
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Nov 2011 18:55:52 +0000 (1 19:55 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Nov 2011 18:55:52 +0000 (1 19:55 +0100)
tree5898042472026d7f3ebbc74c01e18d4bed86ef31
parenta4276fe09638e602d145976bc8f268b9fbb552ee
parent11fd3b45bb6615bb5f90fc7e65301b382467da7f
Merge branch 'm20_MDL-29213' of git://github.com/danmarsden/moodle into MOODLE_20_STABLE