Merge branch 'MDL-47159_master' of git://github.com/dmonllao/moodle
commit73bf1119ddc19181f02fac81c7d7c3def9f5e28f
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Jan 2015 20:18:24 +0000 (27 21:18 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Jan 2015 20:18:24 +0000 (27 21:18 +0100)
tree2a209f72e08cfb7ded93cf60de85d15e4ee6bd6e
parent7615deba22cfae9076a79fc8ce902b24815c1fff
parent58f2c3ca5c8158b26c0d082c498dbabda49ed88c
Merge branch 'MDL-47159_master' of git://github.com/dmonllao/moodle