Merge branch '44156-27' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Feb 2014 23:53:22 +0000 (00:53 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Feb 2014 23:53:22 +0000 (00:53 +0100)
commit08e622b2482bfd717106b9363a4df695e7a2b985
tree3aeaf8843f5cc558e90a91e07a9c2fded97605a8
parent6a586f0036479d6963100b32cd0847f33fa5f70f
parent11e41f1ae4884e78f42f0f2a7ef9c3e6b1134b94
Merge branch '44156-27' of git://github.com/samhemelryk/moodle