Merge branch 'MDL-37787_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Feb 2013 09:07:58 +0000 (10:07 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Feb 2013 09:07:58 +0000 (10:07 +0100)
commit7fe9a7863a8afe46cbbc85f6a51708241a6820e3
treecb2f16f6eb13ccb8d98e06b1c701d82cdf9f3570
parenta3cdb2ba7e74f012a13deb5633ccf907c3fd6ba7
parent68fae082df255e7f890244ba69e80e9035f2a521
Merge branch 'MDL-37787_master' of git://github.com/dmonllao/moodle