Merge branch 'MDL-41728-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Sep 2013 19:17:05 +0000 (21:17 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Sep 2013 19:17:05 +0000 (21:17 +0200)
commitcfcd93dd11d7335ff0b5116f2954fbd3a0dc9920
tree7502c5995e8ed81e5abf728189e9fa7ea944493a
parente79ca991fb7be80d8179c749f21fb41e789174e6
parent39ca3044eaf1fbda41b3519118b93335c6c32ec4
Merge branch 'MDL-41728-master' of git://github.com/sammarshallou/moodle