Merge branch '21_MDL-25996_making_language_editing_terms_user_friendly' of git:/...
commitc85e0f6e1e5e29f9fc3ad55c3df6f0abb76fb163
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Feb 2012 09:48:50 +0000 (21 10:48 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Feb 2012 09:48:50 +0000 (21 10:48 +0100)
tree814604462c4fafe08af44368ace28ac12e829e4a
parent7b98cbf20e83461250ead0f3214ceddc89e3a9a5
parent2d3eed0fbaa82d57ed7a1580c84b86fd3d2492d5
Merge branch '21_MDL-25996_making_language_editing_terms_user_friendly' of git://github.com/gerrywastaken/moodle into MOODLE_21_STABLE