Merge branch 'MDL-41839-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Sep 2013 00:33:30 +0000 (02:33 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Sep 2013 00:33:30 +0000 (02:33 +0200)
commit14976b35687e12241b03eaa73cc34eb01aaafdc6
treeb63c1bc4daf483dfdc276efa0daddf24db7ca708
parent25e02ab6ee641ceeae97c74ac19574f15ec12d91
parent771e3f7cab2ffae05b61ed3f45da1167ca80c2e6
Merge branch 'MDL-41839-master' of git://github.com/sammarshallou/moodle