Merge branch 'MDL-25948_m21' of git://github.com/markn86/moodle into MOODLE_21_STABLE
commit828bb475ac6451da9204e9e8d595a7802e255f7d
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 9 Nov 2012 17:58:33 +0000 (9 18:58 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 9 Nov 2012 17:58:33 +0000 (9 18:58 +0100)
treeeffc2685e27ed0cf01cacb227d58aa05c8dff34a
parentc04de0228291af53ab62412af0935eb49afd19ec
parent7ea26a73c44195cf16da2640009059bcb56ed316
Merge branch 'MDL-25948_m21' of git://github.com/markn86/moodle into MOODLE_21_STABLE