Merge branch 'MDL-25786' of git://github.com/epsd/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 31 Jan 2011 05:31:40 +0000 (13:31 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 31 Jan 2011 05:31:40 +0000 (13:31 +0800)
commit60177f84a82337419c1e7ce11c6069b772331dba
tree87c75f987b18a8286c05f6cd90ddce0e85871844
parent13b9fe035c62fd772212c2aa5477b96948961662
parent217947351b004195874dc6daddd94c3e5acc6161
Merge branch 'MDL-25786' of git://github.com/epsd/moodle