Merge branch 'MDL-35343_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commit694c861e812523504d3c5d46ed7ddc2cf5522905
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Sep 2012 14:42:09 +0000 (10 16:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Sep 2012 14:42:09 +0000 (10 16:42 +0200)
tree6f81ccc512ee491484790203132e9d3244b99a42
parent057d68fc2ec51debb3db1649e9d692ed0cdf93bd
parentfa7298ed7fa564b38de3f977bf5114f6d9266155
Merge branch 'MDL-35343_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE