Merge branch 'MDL-43439_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Jan 2014 23:03:34 +0000 (00:03 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Jan 2014 23:03:34 +0000 (00:03 +0100)
commit75bdb2bfc7302d63ac156be727b75c6ede57d3f7
treea8c3735e71eb4513edb4395ea6ead794969faf79
parent7d4c752e315d3a5b91a51c9d124afb28f9f91948
parent5c0dfe32ebd85e5bf1e14e97f06be235acd3a7fd
Merge branch 'MDL-43439_master' of git://github.com/dmonllao/moodle