Merge branch 'MDL-38484_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Mar 2013 23:47:32 +0000 (00:47 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Mar 2013 23:47:32 +0000 (00:47 +0100)
commit18ceea60afa4c4c8d5a30c4852aa121db36f905c
tree3b4a2cec09ca0b239cfe6c273c75afcba8303177
parent2477bb29cc102b51c5b656472f2f6b0f14a5e16d
parentb4e94458c7c28fbb4710c8dda6567590147be1cd
Merge branch 'MDL-38484_master' of git://github.com/dmonllao/moodle