Merge branch 'MDL-35034-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE
commit222abcddd4c9e346241b5dfa6fd706a942653ea5
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Sep 2012 23:18:54 +0000 (6 01:18 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Sep 2012 23:18:54 +0000 (6 01:18 +0200)
tree6785c6f81cb5252532b73162248ca179ded61590
parentdd0e60cb3d9ecb3833099915953ef4346b062650
parent1e12baddde828b0aa941f44621ef000cd3cbebd2
Merge branch 'MDL-35034-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE