From: Sam Hemelryk <sam@moodle.com>
Date: Mon, 30 Apr 2012 00:50:38 +0000 (+1200)
Subject: Merge branch 'MDL-29044-master-3' of git://git.luns.net.uk/moodle
X-Git-Tag: v2.3.0-beta~653
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=6caa86747f4a5c67ecc4d7e1ad9231e8b0c0b830

Merge branch 'MDL-29044-master-3' of git://git.luns.net.uk/moodle
---

6caa86747f4a5c67ecc4d7e1ad9231e8b0c0b830