Git merges in Moodle 2.5.6 by Eloy Lafuente (stronk7)

commit ff677821fc9e099311c74c1c8c1bedf3d0ca46c3
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 08 May 2014 18:02:38 +0800
Tag:    v2.5.6

Merge branch 'wip-mdl-44262-m25' of https://github.com/rajeshtaneja/moodle into MOODLE_25_STABLE

commit aded9ff97249ba88a039437256291945e097e635
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Apr 2014 09:23:50 +0800
Tag:    v2.5.6

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

commit 21e91b92873f15615ad04ee5b8d1483bdeef7f87
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Apr 2014 08:50:51 +0800
Tag:    v2.5.6

Merge branch 'wip-MDL-43398-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit 3b7aef2de9bded6a2e95f25bee82cfe60ed7984a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Apr 2014 08:20:57 +0800
Tag:    v2.5.6

Merge branch 'wip-MDL-41102-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit b869a723da4357e534dba55b4b3dfff3e4f81027
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 02 Apr 2014 03:50:31 +0800
Tag:    v2.5.6

Merge branch 'wip-MDL-35305-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit 82d6ad7a7f3c880d60507e1b8350d5afc27ea622
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 26 Mar 2014 04:54:12 +0800
Tag:    v2.5.6

Merge branch 'wip-MDL-41285-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit 796e6f21536fcbee32cef513c9a11cc1a751fba4
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 13 Mar 2014 06:28:07 +0800
Tag:    v2.5.6

Merge branch 'MDL-43266_25-last-fixes' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

commit f755c4a8492b68eebe334c93f51124af13d5f80b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 12 Mar 2014 07:19:31 +0800
Tag:    v2.5.6

Merge branch 'wip-MDL-32699-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

commit 46e04019c265c19a5b998f404fdee892e7113312
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 11 Mar 2014 07:29:13 +0800
Tag:    v2.5.6

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