Merge branch 'wip-MDL-37987-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Feb 2013 23:10:35 +0000 (00:10 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Feb 2013 23:10:35 +0000 (00:10 +0100)
commit26581a7420a018746d046ea0602ef99ddf3a3f5b
treeee4d5c992a9994e6df7cc59cb533ac6015544118
parent4e6bb9d315dbcb78aac026e4dc45b69f9ab9d1ea
parent7d579b1e613fef305b461102ed87e507a4ac36d9
Merge branch 'wip-MDL-37987-master' of git://github.com/marinaglancy/moodle