Merge branch 'MDL-29350-MOODLE_21_STABLE-2' of git://git.luns.net.uk/moodle into...
commit6c628d482ae56ce85827e8673f9a4f79cdae5a56
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 17 Nov 2011 19:16:13 +0000 (17 20:16 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 17 Nov 2011 19:16:13 +0000 (17 20:16 +0100)
tree54eae274b3caee67e747f160dc24d9b4b35803a0
parent02c43cd86a277471af0bdfe36d1dd5b002fcb94b
parent3815ecf471f92059db29e21809a3c8c918c25c9b
Merge branch 'MDL-29350-MOODLE_21_STABLE-2' of git://git.luns.net.uk/moodle into MOODLE_21_STABLE