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)
commit92bdda9bd977754c07c9a4fcd6153f952db83bc5
tree5c5ad5854cd5a155432cd4ee88f4cf42b98774e0
parentb93e0af3fe2749e822fb823ab57fea4c5dc46670
parentcdd651a676ddd60a9e0c2e64b9d582ea3cb59c2c
Merge branch 'w50_MDL-37171_m25_outdatedexcel' of git://github.com/skodak/moodle