Merge branch 'MDL-28520' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 3 Aug 2011 07:03:30 +0000 (15:03 +0800)
committerSam Hemelryk <sam@moodle.com>
Wed, 3 Aug 2011 07:03:30 +0000 (15:03 +0800)
commit948ef5d07aa3c89a34a65173eaf399324149ec60
tree5861f84b9c17220254c287b3f6dfa9dc712797d8
parent92f97e82532a5a5ab274b269fc3d41a79d4a04f2
parent84ee73ee3bd49ffc6531cf0d334aaf11fdae7710
Merge branch 'MDL-28520' of git://git.luns.net.uk/moodle