Merge branch 'MDL-33503' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 5 Jun 2012 22:18:43 +0000 (10:18 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 5 Jun 2012 22:18:43 +0000 (10:18 +1200)
commitdd9e2c8d444b614ad6823d5b634be5546d8e872b
tree5a82f2432c82cd31d60ebac452dae64cf577202d
parent447ebaa90ee7f4437f62f78a550132ebcb9d517b
parentd57e6d531f61505ca17afbfdfe79abf23fbc21a0
Merge branch 'MDL-33503' of git://github.com/stronk7/moodle