From 263f8b3188aee5fbc210ede2d1993e8b38aae175 Mon Sep 17 00:00:00 2001
From: Jerome Mouneyrac <jerome@moodle.com>
Date: Tue, 29 Nov 2011 16:22:39 +0800
Subject: [PATCH] Merge branches 'MOODLE_21_STABLE' and 'MOODLE_21_STABLE' of
 git://git.moodle.org/moodle into MOODLE_21_STABLE