Merge branch 'MDL-37775_master' of git://github.com/lazydaisy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Feb 2013 23:57:20 +0000 (00:57 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Feb 2013 23:57:20 +0000 (00:57 +0100)
commitfc395e02f740ee7b71f7c9c03916204ff63e215b
tree48de139b2f0850504327276bf28e939b1ca0d681
parenta0c3faeaefbb1671d338752187ab9354751dc779
parent772cd5c8fa21e6ca46ae8a0f3d02b50b86a0ef89
Merge branch 'MDL-37775_master' of git://github.com/lazydaisy/moodle