Merge branch 'wip-MDL-30059-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 8 Nov 2011 00:00:00 +0000 (13:00 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 Nov 2011 00:00:00 +0000 (13:00 +1300)
commit195ad02f4ab34d1665492a9c24c2d42cecb1c268
tree05e32208b53dbb00a3f98b4a53f0aa87ac9160c2
parent3e4fb0cf81b2f33aca5656d6aca99b9b565d94d2
parent92d0dd9fb89ce708c5cacf0bc8a2340cbc1c763e
Merge branch 'wip-MDL-30059-master' of git://github.com/phalacee/moodle