Merge branch 'MDL-32670' of git://github.com/rlorenzo/moodle
commitcd6b62c8491f01d1dc32401159c62d1a0dd92015
authorSam Hemelryk <sam@moodle.com>
Tue, 8 May 2012 06:07:07 +0000 (8 18:07 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 May 2012 06:07:07 +0000 (8 18:07 +1200)
tree469df1f06cec387eba6019cce39a4019b7c4c153
parentd7013dba2027105a010c9dede19b9e6081c78299
parent4ff8dcccccc8e2734f28d824906315b941708214
Merge branch 'MDL-32670' of git://github.com/rlorenzo/moodle