Git merges in Moodle 2.5.2 by AMOS bot

commit ce31fccf0e8425fa7254b4a3b440c9856bced749
Author: AMOS bot <amos@moodle.org>
Date:   Fri, 06 Sep 2013 08:47:47 +0800
Tag:    v2.5.2

Merge branch 'MOODLE_25_STABLE' into install_25_STABLE


commit 2fc1329f4486b3465f086ff8a4d1f9a724a25471
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 31 Aug 2013 08:43:54 +0800
Tag:    v2.5.2

Merge branch 'MOODLE_25_STABLE' into install_25_STABLE


commit 441678ecb469b9460107069c483c294d7e2e485c
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 24 Aug 2013 08:59:02 +0800
Tag:    v2.5.2

Merge branch 'MOODLE_25_STABLE' into install_25_STABLE


commit 0147686fc7e2ca9abf4279232334cafd98fa7f35
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 27 Jul 2013 08:43:10 +0800
Tag:    v2.5.2

Merge branch 'MOODLE_25_STABLE' into install_25_STABLE