Merge branch 'MDL-44523_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Jul 2014 16:06:52 +0000 (18:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Jul 2014 16:06:52 +0000 (18:06 +0200)
commit8707dae4f8cb9b3731767aa93e8007aef2fef32a
tree2c2da357cabbfd0bfd43db7cc807f7e4b85531da
parentc5afe577c9ec8a735964222a13511a708bd0231e
parent93d14b8ad1659114c5830b53322540a0d69ce634
Merge branch 'MDL-44523_master' of git://github.com/dmonllao/moodle