Merge branch 'w50_MDL-37171_m25_outdatedexcel' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 20 Dec 2012 09:22:46 +0000 (10:22 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 20 Dec 2012 09:22:46 +0000 (10:22 +0100)

Trivial merge