Merge branch 'MDL-38939_master' of git://github.com/dmonllao/moodle
commit2cef0f7c333e007109d9a97a8e54bd1da24c8ecd
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Apr 2013 22:32:40 +0000 (11 00:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Apr 2013 22:32:40 +0000 (11 00:32 +0200)
treebe25f1525395b607bbd229fcfcae2537e824e128
parenta7ed1eca089df32073643d8a7feb67d11ba54824
parent9afb97a701a9cc582306ebc2ecab7d10ddce79f6
Merge branch 'MDL-38939_master' of git://github.com/dmonllao/moodle