Merge branch 'MDL-34957_master' of git://github.com/lazydaisy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Aug 2012 06:23:22 +0000 (14:23 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Aug 2012 06:23:22 +0000 (14:23 +0800)
commiteca92c379e3604b660fe6eb4abeac6b3f21fa35e
treec7a88362ac83abb232afd91d3d12d3289f23d2e5
parent09b07f748c933cf33c0182c1fc64a3ad8cfcabc3
parent27d36445a9322479e7e086e2b74f2b8ade97cdd0
Merge branch 'MDL-34957_master' of git://github.com/lazydaisy/moodle