Merge branch 'wip-MDL-31948-master' of git://github.com/phalacee/moodle
commit303cb36b183db65c1911319f08749ff00f2df834
authorSam Hemelryk <sam@moodle.com>
Tue, 8 May 2012 23:49:33 +0000 (9 11:49 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 May 2012 23:49:33 +0000 (9 11:49 +1200)
treec0e2d6e2220cae7bc0d4f84eecb5c3a7a0e022ee
parenta8f127950e1d384aabf31e8748bd6ad11957a9c2
parentce5f042b82fefa4b782d56a6067b89869c26425c
Merge branch 'wip-MDL-31948-master' of git://github.com/phalacee/moodle