Merge branch 'MDL-22351-M20' of git://github.com/lazydaisy/moodle into MOODLE_20_STABLE
commit1739fe7331654efe40264958cb8a930b3a9580a9
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 11 Nov 2011 01:34:32 +0000 (11 02:34 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 11 Nov 2011 01:34:32 +0000 (11 02:34 +0100)
tree9c216a965d6bb1fbf8f5a554a3bb506107898307
parentd83c73053db8a5b18166a191aa7f2a368b737025
parent7946da5f3c6b6564e740adcceaae112fbe07ba66
Merge branch 'MDL-22351-M20' of git://github.com/lazydaisy/moodle into MOODLE_20_STABLE