Merge branch 'MDL-26243-master' of https://github.com/mackensen/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 14 Mar 2012 23:39:17 +0000 (00:39 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 14 Mar 2012 23:39:17 +0000 (00:39 +0100)
commit3e59bbdbb73012a7dc84908b3c6d0654edf3f4d9
tree7be44827b128ebbc833133cb872206b4fd598188
parentb33e6d8e8beb063a2e29e62d3a04aabe41e8449b
parenteb5947bccad68d26cd37979b920d7294bff6adc4
Merge branch 'MDL-26243-master' of https://github.com/mackensen/moodle