Merge branch '43675-27' of git://github.com/samhemelryk/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 20 Jan 2014 02:57:30 +0000 (10:57 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 20 Jan 2014 02:57:30 +0000 (10:57 +0800)
commitc8bfabd267f56ebf288798bdab394dfae28d0945
treee450342e0e1c598fc4de7415d2e4f151bd1a5eca
parentfa8861964ab0627883d15ba16a92349e3a1210f1
parent956e2e8a8c20870b928aad9923f28a47088f822b
Merge branch '43675-27' of git://github.com/samhemelryk/moodle