Merge branch 'MDL-30706' of git://git.luns.net.uk/moodle
commited569481a3edc61bdfc360002622015df6d454ef
authorSam Hemelryk <sam@moodle.com>
Mon, 2 Jan 2012 21:09:11 +0000 (3 10:09 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 2 Jan 2012 21:09:11 +0000 (3 10:09 +1300)
treefed58234ba0e7ec98072f227d557c616a5c9d497
parent01dcafd8d5c66c14aa4d2ccaa16aea3c7726e541
parentb35bf95853a165f1360f1d9a753ed801b0201734
Merge branch 'MDL-30706' of git://git.luns.net.uk/moodle