Merge branch 'wip-MDL-35847-master' of git://github.com/phalacee/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Feb 2013 23:08:44 +0000 (00:08 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Feb 2013 23:08:44 +0000 (00:08 +0100)
commit1615caae6f571e339f564a949684a564e058f0ed
treee4dcda321964710b73f57b4124fe328f3f3ad41a
parent8d8f9cf756b5258769d88cd2b86d8a78c532ad89
parent3246648b4838d7c25d4b8a534354933fbb3220aa
Merge branch 'wip-MDL-35847-master' of git://github.com/phalacee/moodle