Merge branch 'MDL-54707_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jun 2016 18:00:43 +0000 (20:00 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jun 2016 18:00:43 +0000 (20:00 +0200)
commit74eb5bb9feb0f4243b2d7bb1eeca5fafc84c6ed0
tree9a4e51ca8678d7ffa03d03138a8e7e86df95df2a
parent0efd933a1f79fe8318fe13cf748cf509a757d7f2
parent25ba053ff2bb5d842f846f4739ab710a4b50dfa4
Merge branch 'MDL-54707_master' of git://github.com/dmonllao/moodle