Merge branch 'MDL-40275-m' of git://github.com/micaherne/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Jul 2013 19:52:17 +0000 (21:52 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Jul 2013 19:52:17 +0000 (21:52 +0200)
commitcfe8b6df3320ff3fc548a621c89f810ba89c5816
tree89038ff79b1d0f9727172ad81fe592c272457db8
parent1b80060ff04b0d5627576128f053f2abde5f2df7
parent4dd791328e20daf51c6ea0e5e9f8a5ac438e0402
Merge branch 'MDL-40275-m' of git://github.com/micaherne/moodle