Merge branch 'MDL-33045-master-2' of git://git.luns.net.uk/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 30 May 2012 06:14:50 +0000 (14:14 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 30 May 2012 06:14:50 +0000 (14:14 +0800)
commit2605112e0b23a09e4c21f1f339329c0b39ae239a
treed2522adde380b54e22ce70c3007bc73030c318cd
parent378eb6f6a2500d06e22408faa8e03daa30b2cd32
parent599f7a279c7f078941ede3c448f574a92be40efc
Merge branch 'MDL-33045-master-2' of git://git.luns.net.uk/moodle