Merge branch 'MDL-30018_22' of https://github.com/stronk7/moodle into MOODLE_22_STABLE
commit4340e2faace07f7eb45870cd789640515648a749
authorSam Hemelryk <sam@moodle.com>
Tue, 11 Sep 2012 03:21:44 +0000 (11 15:21 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 11 Sep 2012 03:21:44 +0000 (11 15:21 +1200)
tree4ec73f680f4afe3fc6b6116152b83deef66dbd69
parent1db9d1e7ec24f7e37c91fdeddd4127b158ed708c
parentcb69b471bd511837b2dea4df0342a90c7af24f75
Merge branch 'MDL-30018_22' of https://github.com/stronk7/moodle into MOODLE_22_STABLE