Merge branch 'wip-MDL-39554-m25' of git://github.com/samhemelryk/moodle
commit2fd46e12b8db398d55009f30e531e1609ad39165
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 May 2013 00:14:20 +0000 (8 02:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 May 2013 00:14:20 +0000 (8 02:14 +0200)
tree20796854d043f8d25117f6892c332f833b44696e
parent5df9bc3998095299c6862973866252649a5e0866
parent54519330120e95cd9b22f860cfaab6a503d9df5b
Merge branch 'wip-MDL-39554-m25' of git://github.com/samhemelryk/moodle