From: Dan Poltawski <dan@moodle.com>
Date: Mon, 20 Jan 2014 01:45:43 +0000 (+0800)
Subject: Merge branch 'wip-mdl-43306-m' of git://github.com/rajeshtaneja/moodle
X-Git-Tag: v2.7.0-beta~696
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=e6fbca9f65aa4449509b66bb08bd404d79a1c5e3

Merge branch 'wip-mdl-43306-m' of git://github.com/rajeshtaneja/moodle
---

e6fbca9f65aa4449509b66bb08bd404d79a1c5e3