Merge branch 'MDL-31329' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 23 Jan 2012 03:28:17 +0000 (11:28 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 23 Jan 2012 03:28:17 +0000 (11:28 +0800)
commitbe9974120ec5910c084df30378f01b6a9a625377
treeec3ec77d1f8052053ad1f1c20bbea451428d9a6f
parent2bea3cd8d17be459940677074b16b273c0c067f5
parent14f349cb78800f3ee17d4bb3a3a4058b8927a78b
Merge branch 'MDL-31329' of git://github.com/stronk7/moodle