Merge branch 'MDL-41690-master' of git://github.com/danpoltawski/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 6 Jan 2014 07:48:31 +0000 (15:48 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 6 Jan 2014 07:48:31 +0000 (15:48 +0800)
commit5490662aded1e04cbca3c22d56d05b70fcaf50da
tree4fd115c1bd1e63a8343824ab425381bc873378b0
parent00447fd617fc8283ebe0e62839188e95b9ad2eb1
parent73ee2fda6b6c59ddff6747322b075f8cadc612c4
Merge branch 'MDL-41690-master' of git://github.com/danpoltawski/moodle

Conflicts:
course/dnduploadlib.php