Merge branch 'MDL-39452-master' of git://github.com/sammarshallou/moodle
commitd40a24384e5a1a5d238ce7a8f86c212444a940bc
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 May 2013 20:06:04 +0000 (7 22:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 May 2013 20:06:04 +0000 (7 22:06 +0200)
treed4585fd30a2eaaa67f1788c2f52060ceb27609a9
parentfbd84c8eb5cd4e676d8562d2e68c59db1a49d90c
parent7593df0a55bd7ee4a6f0e52cf2d1bd7e316ebebc
Merge branch 'MDL-39452-master' of git://github.com/sammarshallou/moodle