Merge branch 'MDL-31017' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 4 Jan 2012 22:17:31 +0000 (11:17 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 4 Jan 2012 22:17:31 +0000 (11:17 +1300)
commitcf6d069afd9cd45b60d09c2474cb9c6a66d02b34
tree62cf798bc68634fde92f8198888367a4ee0259d5
parent45ad2d871cf9ebad6ac36e0fcf17db4b71f68b40
parentfb95ef9ecd43d5791fac3eccae3ae84d0ff9fc86
Merge branch 'MDL-31017' of git://github.com/stronk7/moodle