Merge branch 'MDL-25883-master' of https://github.com/mackensen/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 13 Feb 2012 01:35:19 +0000 (14:35 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 13 Feb 2012 01:35:19 +0000 (14:35 +1300)
commit645573cab38be7bf4bd4892c34e869e776111a65
treeaa27c188d34d345e140f6a8aacce34fa2d84ef25
parent5fc420e2ed32e4399cd084489af5d4a6bd71135f
parentabf639be01c97be4a7edec4adc9c62ded073ac3d
Merge branch 'MDL-25883-master' of https://github.com/mackensen/moodle