Merge branch 'wip-MDL-37453-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Jan 2013 23:06:06 +0000 (00:06 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Jan 2013 23:06:06 +0000 (00:06 +0100)
commiteaa00a071ca6f2dd974c990072da1d4e8ff0ec59
tree9565d9b70e274dcb67cc99ae3f13682a475f13bf
parentfe25b31d44e8ad3f2faaa8614d96712a44036479
parent7b59f5b32a84142c2f33c694fbbf2909e263a394
Merge branch 'wip-MDL-37453-master' of git://github.com/marinaglancy/moodle