Merge branch 'wip-MDL-31950-master' of git://github.com/phalacee/moodle
commita8f127950e1d384aabf31e8748bd6ad11957a9c2
authorSam Hemelryk <sam@moodle.com>
Tue, 8 May 2012 23:49:23 +0000 (9 11:49 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 May 2012 23:49:23 +0000 (9 11:49 +1200)
tree0778fcdfd07bac61e4327fffb8368522111b88af
parentd779cd65a97570781e2e49880f26b8d2bc13fe38
parent3edf380de60d93bfc4ac09435e259d46b4c498e6
Merge branch 'wip-MDL-31950-master' of git://github.com/phalacee/moodle