Merge branch 'MDL-31831_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE
commitebbb9143469e78ef2110e3fc93712fb89e7c913a
authorSam Hemelryk <sam@moodle.com>
Thu, 1 Mar 2012 01:34:52 +0000 (1 14:34 +1300)
committerSam Hemelryk <sam@moodle.com>
Thu, 1 Mar 2012 01:34:52 +0000 (1 14:34 +1300)
tree5ad6752bae628268cc64e479b185a2582f3ba3ab
parent2e2ca2af54f21b6b8963f3998fa05592554b2139
parentee3d7d8a7170124e06a0036a7cd009dee609c429
Merge branch 'MDL-31831_22' of git://github.com/stronk7/moodle into MOODLE_22_STABLE