Merge branch 'MDL-38416-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 23:34:52 +0000 (00:34 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 23:34:52 +0000 (00:34 +0100)
commite233dc58ed4907eb372fe24d05cf3f4fee3d4eb5
treeabde04b3086aeb885b4520367a53ae9ab3ba3dfb
parentb35dd05521b641be1174f29dbb03a127184ddf7c
parenta4faf4f416d1ce89780d6960291dc17e889d884b
Merge branch 'MDL-38416-master' of git://github.com/FMCorz/moodle