Merge branch 'MDL-46753-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Aug 2014 00:07:56 +0000 (02:07 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Aug 2014 00:07:56 +0000 (02:07 +0200)
commitfd6bfe58562af31766a2a51e4780f5d887f49ba7
tree0b5574d6c1e4f47c1925b0c8f1c112cc211ddec9
parent863c536219522639c64ebd7a4d3cc1c67d8fb80e
parent71ec01afa6838ddeca0cefc4f47d2ab440feb3e0
Merge branch 'MDL-46753-master' of git://github.com/lameze/moodle