Git merges in Moodle 2.6.x by Aparup Banerjee

commit ed289a2cdd76a6c143cffbb50815546b1ab6bef6
Author: Aparup Banerjee <aparup@moodle.com>
Date:   Wed, 13 Nov 2013 09:51:09 +0800
Tag:    v2.6.0-rc1

Merge branch 'MDL-42711-master' of github.com:nebgor/moodle into MDL-42711-master

commit 95b2934b23521cc738069d428e6c912b71e3e610
Author: Aparup Banerjee <nebgor@gmail.com>
Date:   Wed, 13 Nov 2013 09:48:46 +0800
Tag:    v2.6.0-rc1

Merge pull request #3 from mudrd8mz/MDL-42711-lmnet-clean-theme-backport