Merge branch 'MDL-31604-attempt3' of git://github.com/mouneyrac/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 14 Feb 2012 02:48:51 +0000 (15:48 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 14 Feb 2012 02:48:51 +0000 (15:48 +1300)
commitec22386a40a79087afe395b2613f0caabd5f2383
tree1158d5fc267ea6cce580bd4fb5bbdd7a06d6a60e
parent37ee40dc169cfef58e4b3da18de399932ef05a03
parent6b7f1717e94238206fe9a7557baed3590df572ed
Merge branch 'MDL-31604-attempt3' of git://github.com/mouneyrac/moodle