Merge branch 'w34_MDL-34912_m24_description' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Aug 2012 00:39:10 +0000 (02:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Aug 2012 00:39:10 +0000 (02:39 +0200)
commitfffb9b9064098c260be3b170ae63ca475624186a
tree9ead778470940988d9a9ef6cee79a052ff1873db
parentee998a687cd6e478ae946d492b8c5ae75976656b
parent4a38e65977908e1e54dd32e35f3dfeac5996b9b2
Merge branch 'w34_MDL-34912_m24_description' of git://github.com/skodak/moodle