Merge branch 'm20_MDL-14934_excel_time' of github.com:dongsheng/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Dec 2010 11:21:21 +0000 (12:21 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Dec 2010 11:21:21 +0000 (12:21 +0100)

Trivial merge