Merge branch 'wip-MDL-43211-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Jan 2014 00:54:00 +0000 (01:54 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Jan 2014 00:54:00 +0000 (01:54 +0100)
commitba766c47721abb62c9402fa6e964659915ce46e3
tree6f4554fca802202a77e07924f13cb7b98af5e93a
parent2079744b84574992d58d8be70b00b336a4b7a26f
parentfc630b2b01d2ec4f2f7b74f49cc80e88cd4b5cea
Merge branch 'wip-MDL-43211-master' of git://github.com/marinaglancy/moodle