Git merges in Moodle 2.5.5 by Marina Glancy

commit 72c9dda9fd820ca5610d5300755493033c89c231
Author: Marina Glancy <marina@moodle.com>
Date:   Tue, 11 Feb 2014 14:43:22 +0800
Tag:    v2.5.5

Merge branch '28567-25' of git://github.com/samhemelryk/moodle into MOODLE_25_STABLE

commit d977433b7a52112a99e0228200358711db4f0393
Author: Marina Glancy <marina@moodle.com>
Date:   Wed, 05 Feb 2014 15:58:42 +0800
Tag:    v2.5.5

Merge branch 'MDL-42339_m25' of git://github.com/rwijaya/moodle into MOODLE_25_STABLE

commit ccb30e1f7b3ea70f16f4d94d40222618490bdc06
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Feb 2014 17:35:17 +0800
Tag:    v2.5.5

Merge branch 'MDL-41647_25' of git://github.com/apsdehal/moodle into MOODLE_25_STABLE

commit 1038bbb275c41af61c904b56daf0464ee2e833fb
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Feb 2014 16:10:17 +0800
Tag:    v2.5.5

Merge branch 'MDL-43805-25' of git://github.com/damyon/moodle into MOODLE_25_STABLE

commit 8c3470e3ce5412063ee68e328055cfa7b8fe4899
Author: Marina Glancy <marina@moodle.com>
Date:   Mon, 03 Feb 2014 13:52:11 +0800
Tag:    v2.5.5

Merge branch 'MDL-43440-25' of git://github.com/mr-russ/moodle into MOODLE_25_STABLE

commit c2a4d082a663064b017b471f63af33338904cb00
Author: Marina Glancy <marina@moodle.com>
Date:   Fri, 31 Jan 2014 14:11:15 +0800
Tag:    v2.5.5

Merge branch 'install_25_STABLE' of git://git.moodle.org/moodle-install into MOODLE_25_STABLE