MDL-43606 tinymce_managefiles: bump version

to allow smooth upgrade from contributed plugin in 2.5
Merge branch 'wip-MDL-43606-master' of git://github.com/marinaglancy/moodle
MDL-25500 lock: New locking framework.

This locking system is designed to be used everywhere requiring
locking in Moodle. Each use of the locking system can be configured
to use a different type of locking (or the same type with a different
configuration).

The first supported lock types are memcache, memcached, file (flock),
db (specific handlers for pg and mysql).