Merge branch 'MDL-27242-master' of git://github.com/sammarshallou/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Oct 2011 04:28:32 +0000 (17:28 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Oct 2011 04:28:32 +0000 (17:28 +1300)
commitd97505d2a344df0934972521464cdd123a3dd047
treef27506685c14cf1cf4da16bb6540447f7ee66cea
parenta6ec1940c841dbfad14a738ea7f7bbc3b9b15afd
parent6282381d05a62b032c20d25b7b29d8ead41cfbbd
Merge branch 'MDL-27242-master' of git://github.com/sammarshallou/moodle