From: Damyon Wiese <damyon@moodle.com>
Date: Tue, 8 Oct 2013 08:19:25 +0000 (+0800)
Subject: Merge branch 'MDL-40053-master' of git://github.com/ankitagarwal/moodle
X-Git-Tag: v2.6.0-beta~114
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=7bfc69b0c2d15b38c0e962d64d8653528fc79339

Merge branch 'MDL-40053-master' of git://github.com/ankitagarwal/moodle
---

7bfc69b0c2d15b38c0e962d64d8653528fc79339