Merge branch 'MDL-26240' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 29 Nov 2011 03:52:50 +0000 (16:52 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 29 Nov 2011 03:52:50 +0000 (16:52 +1300)
commit9ac82391a27bbd170435c3e7a88b793f8a215463
treeba8183f0b5ba8c7e2f47c3d4680d823d644f90a1
parent223b3ce3a09b93141ae9a53f732e11ae5bf2f460
parentd11d1e5bc010215d3aec8d65528ce7001c1d0dea
Merge branch 'MDL-26240' of git://github.com/lazydaisy/moodle