Merge branch 'MDL-28486-master-2' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 5 Aug 2012 23:59:07 +0000 (11:59 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 5 Aug 2012 23:59:07 +0000 (11:59 +1200)
commit71761f8aa8729b0361bc8c363313a3497914b97e
tree7b7ee42d304f390150ed783eb74c71c665e21a33
parent8cca2fbb6e9722627f12796405ac2e84e98027af
parentfeddb588ec2f2255a7363d7cc00eca18ac9fde5f
Merge branch 'MDL-28486-master-2' of git://git.luns.net.uk/moodle