Merge branch 'wip-MDL-37224-m25' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Feb 2013 23:48:12 +0000 (00:48 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Feb 2013 23:48:12 +0000 (00:48 +0100)
commit349c224817566ef8aac2a19e56315eb28fee1759
tree8441ecf6a7a27ab167fb27c18260acfd82872ada
parentca1774aea40ab81fde8441da1be648e58d5312d8
parentdb6539c62a5c072d9e9ad348bd2c32bee3b2ff39
Merge branch 'wip-MDL-37224-m25' of git://github.com/samhemelryk/moodle