Merge branch 'wip-MDL-27767-master' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 14 Dec 2011 02:16:20 +0000 (03:16 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 14 Dec 2011 02:16:20 +0000 (03:16 +0100)
commitf477e8c1cecbc90eb89ae0f4c1cb9ade72bbf3bf
tree927083aa1f7f95b8183376346e71ce5d36a75cc3
parent5019c8ebb5f0a6e588068b6640dcb12242d7fc16
parent3912cdd1de1666c95fb41d22f0c85b7e3dd685bb
Merge branch 'wip-MDL-27767-master' of git://github.com/samhemelryk/moodle