Merge branch 'MDL-36842' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Dec 2012 23:17:51 +0000 (00:17 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Dec 2012 23:17:51 +0000 (00:17 +0100)
commitcbef51f54bfcb7c39ee79226991ef4d0ef826751
treeea7589e4ee3cc6baea8e4dc3102740b135be7625
parent7039c823dcebe77b1f63ef7431112c37ef62de66
parent4475b0ff63c40061913c70f37cd212383a5b8cb8
Merge branch 'MDL-36842' of git://github.com/timhunt/moodle