Merge branch 'MDL-33389_master' of git://github.com/kordan/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 31 May 2012 14:14:57 +0000 (16:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 31 May 2012 14:14:57 +0000 (16:14 +0200)
commitdac01a7444706c2a1ee610a08e9fcff829d6dbe5
treef77a70b9516d5b52f191b838854d5b521598d1f8
parentc9bd01882586788bd0b9a713f9f13101c8356eb2
parent311300e2085aeea2e9a13f4b622d58260b01c610
Merge branch 'MDL-33389_master' of git://github.com/kordan/moodle