Merge branch 'MDL-31823_master' of git://github.com/dmonllao/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 5 Jun 2012 22:14:00 +0000 (10:14 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 5 Jun 2012 22:14:00 +0000 (10:14 +1200)
commit447ebaa90ee7f4437f62f78a550132ebcb9d517b
tree8de6c804601f0ceedb380697eb6bffa8257fe057
parent4ed1657f3e983574bc61443b40d8bdfa1c4cc5ab
parentd7eb773047e3d242b3f41fc0f97ad5deff9b3773
Merge branch 'MDL-31823_master' of git://github.com/dmonllao/moodle