Merge branch 'MDL-41146-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Sep 2013 23:01:19 +0000 (01:01 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Sep 2013 23:01:19 +0000 (01:01 +0200)
commitdf7995e3a0df0b800daaaa16e0a75d47ff445bb5
treee45b2c81a968365f4d3921200cbc0e57ac377f25
parent58c80b03a85ef64e041f9784e1a37cd00949e6ef
parent07e720010a16ec3dcca51c8b5728ad5351188b6d
Merge branch 'MDL-41146-master' of git://github.com/sammarshallou/moodle