Merge branch 'MDL-30302-master-2' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 29 Nov 2011 03:56:29 +0000 (16:56 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 29 Nov 2011 03:56:29 +0000 (16:56 +1300)
commitfb056a811ecd0179e75d1368079cc95526589848
treed4bebee7e4236ea900d1a55bc1b4be29d1f90cce
parentf091da528e3af4e0ba727743c3b1f525ae8eae6f
parent68ec4a273c909a470c82b50003d6ff735076b845
Merge branch 'MDL-30302-master-2' of git://git.luns.net.uk/moodle