Merge branch 'w51_MDL-35356_m25_excel' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Jan 2013 22:11:54 +0000 (23:11 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Jan 2013 22:11:54 +0000 (23:11 +0100)
commitac4c7aed68cbe70a53f3c865483548868ce6c82c
tree9fd04c730732cbcd9efd3baa8e06ee1dc56df7de
parent3913743aa3d0a054ffedadaf5422e0b8ade88e01
parent8e7591654ada4233c579d859b7a34289297c1b7d
Merge branch 'w51_MDL-35356_m25_excel' of git://github.com/skodak/moodle

Conflicts:
lib/odslib.class.php
lib/odslib.class.php
lib/thirdpartylibs.xml