From: Damyon Wiese <damyon@moodle.com>
Date: Wed, 4 Dec 2013 01:52:51 +0000 (+0800)
Subject: Merge branch 'MDL-43083-master' of git://github.com/phalacee/moodle
X-Git-Tag: v2.7.0-beta~987
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=88e39201d7af38c54c45c3da4843b2ad07b7bb1a

Merge branch 'MDL-43083-master' of git://github.com/phalacee/moodle
---

88e39201d7af38c54c45c3da4843b2ad07b7bb1a