Merge branch 'MDL-38686_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Apr 2013 00:41:33 +0000 (02:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Apr 2013 00:41:33 +0000 (02:41 +0200)
commitd6dc3019b62a6f78a5f6c7465fdb2a7595b6ff39
tree5e97decd5ed71d7e44e1dc7f52d858806438a49a
parent1c49f7ad1986db9b96464bdbb221021a1f2fe910
parenta3dd930ec0c948e89ff9f052ff33d04592454e26
Merge branch 'MDL-38686_master' of git://github.com/dmonllao/moodle