Merge branch 'MDL-31345_M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE
commit23666489f733fd1affb18ae88e272db72918e576
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Feb 2012 10:17:45 +0000 (8 11:17 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Feb 2012 10:17:45 +0000 (8 11:17 +0100)
tree63a91c91417f3ca5952b509b8bf2d95dbe89a34c
parent3512f3bff69998e39cc569ba4c34a2c865dbff82
parentf9b6adaef652fc72fa383cc0cb8f7ddc41456ccd
Merge branch 'MDL-31345_M21' of git://github.com/lazydaisy/moodle into MOODLE_21_STABLE