Merge branch 'wip-MDL-34344-m25' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Jan 2013 00:08:26 +0000 (01:08 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Jan 2013 00:08:26 +0000 (01:08 +0100)
commita91350609eeefd05ea29a9c64cfc371e909a668d
tree4d6ab1e6dc02335a6e55a6c27ba13508e9c4f856
parent3909faf45a6090d3aa6676f7f7cd58ca9552eb6d
parent7f30a6449b52259ef3dd32ab9103a479ecda0670
Merge branch 'wip-MDL-34344-m25' of git://github.com/samhemelryk/moodle

Conflicts:
lib/db/caches.php
lang/en/cache.php
lib/db/caches.php
lib/moodlelib.php