Merge branch 'MDL-38620_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Apr 2013 00:26:54 +0000 (02:26 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Apr 2013 00:26:54 +0000 (02:26 +0200)
commit3e275484317a0a360b7ef9e81e330c06444ff77f
tree33a39fffd1d9aba00388254a86b4266ebff3c650
parent12879418e98121d91ea5e9b77349d066e25f67ed
parente62f1b3b636d93b3faa41c411e0e91c694869202
Merge branch 'MDL-38620_master' of git://github.com/dmonllao/moodle