Merge branch 'MDL-42835-master' of http://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 12 Jun 2014 07:51:11 +0000 (09:51 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 12 Jun 2014 07:51:11 +0000 (09:51 +0200)
commit1a32e1d446443d6477d5ceb43051a899e59084ad
tree5183b4ca9f220d47ebcf99f4682de40821ce9784
parentc2c5d577900eed69663ba7c8035c042ffdcb849c
parentc48c9bf02fbe3fd2840e983c01752e0af67cc169
Merge branch 'MDL-42835-master' of github.com/damyon/moodle