Merge branch 'MDL-35134_master' of git://github.com/pauln/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Sep 2012 00:50:56 +0000 (02:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Sep 2012 00:50:56 +0000 (02:50 +0200)
commite813835f5cea86ba8ee775036177ccd477054fa9
treeab2fc6f7e0a82ef3d4bf48b9ecaf340ed23efddf
parentc0d716d7b9aab8ee46a1777bde84374a955eae88
parentf32cdf71a668bebe50771c355d89996ca0cc6a2a
Merge branch 'MDL-35134_master' of git://github.com/pauln/moodle