Merge branch 'MDL-38788_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Apr 2013 11:17:20 +0000 (13:17 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Apr 2013 11:17:20 +0000 (13:17 +0200)
commit68adfee6d453603f0e08b1fabeeba5f69df8a434
tree1cf90097045eb6d569a43965332d5b6cd49634c7
parentb216376811557c3561e2a3aabde6e3922994a49f
parent1c00d6f636f9128c8c667d71d584925366edb2ec
Merge branch 'MDL-38788_master' of git://github.com/dmonllao/moodle