Merge branch 'MDL-49385-master' of git://github.com/lucisgit/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 17 Mar 2015 06:49:05 +0000 (14:49 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 Mar 2015 06:49:05 +0000 (14:49 +0800)
commit7d5fad1575a1940d49b942003d64eda06d0711df
tree7997184ed300ea285b3564c8175876fcea3a075e
parent96e339cc585fa266dc9e15cb05ff84a886e70f94
parent53c74b18138be24155d5fd4388f17e1b2da704d5
Merge branch 'MDL-49385-master' of git://github.com/lucisgit/moodle