Merge branch 'MDL-40690_master' of git://github.com/dmonllao/moodle
commit3742ee163b3c90e73abe389cf634f71095e91863
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Jul 2013 22:17:30 +0000 (17 00:17 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Jul 2013 22:17:30 +0000 (17 00:17 +0200)
tree3a6263960501c2bebed3695716347fbcf4bd755a
parent55fcd9323e95aabe7c74d0d2883b8e4fed8e05fc
parent39ec82857139a6a2bfe4c9f0a6af7d56203321a3
Merge branch 'MDL-40690_master' of git://github.com/dmonllao/moodle