Merge branch 'MDL-48266-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Jan 2015 18:19:35 +0000 (19:19 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Jan 2015 18:19:35 +0000 (19:19 +0100)
commit16dafa5d9fc175d7efa617d400b119358b8f8168
tree9bff52a9d137f7c7552c9bf0a261b2f73b3e1c54
parent2a5ecfa9757520a6767a9969067d86c287c3335e
parent94b8c63635e6d3171771f1fa832f212527ccd91c
Merge branch 'MDL-48266-master' of git://github.com/FMCorz/moodle

Conflicts:
version.php
lang/en/moodle.php
version.php