Merge branch 'MDL-35593-master' of git://github.com/mouneyrac/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 11 Dec 2012 20:38:43 +0000 (09:38 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 11 Dec 2012 20:38:43 +0000 (09:38 +1300)
commitdb8625bd1e180d2542cf51cca8538c6be10c8bc0
tree335f3cbec2ace8c3657c22094f3bc9283bb232bd
parent5514e22d52cb6fbabffd7091800c97a7f5c9d513
parent87ede25c9be4fa02a6a7d656a9d7fa6b15c05c07
Merge branch 'MDL-35593-master' of git://github.com/mouneyrac/moodle