Merge branch 'w50_MDL-36245_m25_convert' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Dec 2012 22:41:48 +0000 (23:41 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Dec 2012 22:41:48 +0000 (23:41 +0100)
commit917169221f17f02fb68708cdbe48ce5b5f8a01d2
tree7c5258d56408b0e1a2ae8e102893c14404b9eb2e
parent421d18fd2e932cc6c1a1680a8cae3347cdb52e15
parent04463c0ea62565522cdd124287f59d0503f51b57
Merge branch 'w50_MDL-36245_m25_convert' of git://github.com/skodak/moodle