Merge branch 'MDL-50245' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 May 2015 22:32:58 +0000 (00:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 May 2015 22:32:58 +0000 (00:32 +0200)
commit767da25767ba75ba733073a41f2f1dbd93ca0ed3
tree5d1623db206ccfd7985593fcc5e4fd22ec1f4e11
parent04d73f4fffdb8d7b2181658a7d55818df33025b5
parent3a1bc53bc2cb3e1c70ef1de2930fb739def939f2
Merge branch 'MDL-50245' of git://github.com/timhunt/moodle