Merge branch 'MDL-48765-master' of git://github.com/mackensen/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 20 Jan 2015 09:08:21 +0000 (17:08 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 20 Jan 2015 09:08:21 +0000 (17:08 +0800)
commit53aa8423bd39de77959143205a3c9fa7d789238f
treeac4092888ffd02160797f605c8addc38f09fe9e5
parent97b2e747ac306057ace6e2656fa746118ce4804d
parent671d105e9f0fde35c937e32203b9a9d8f58e5089
Merge branch 'MDL-48765-master' of git://github.com/mackensen/moodle