Git merges in Moodle 2.6.x by AMOS bot

commit a2b62eebcb27c8d045aef0b7e90f299a9c7627b9
Author: AMOS bot <amos@moodle.org>
Date:   Fri, 21 Nov 2014 00:05:49 +0800
Tag:    v2.6.7

Merge branch 'MOODLE_26_STABLE' into install_26_STABLE


commit eb4b4c7ba094668f43b2e8fc86900e873465d53a
Author: AMOS bot <amos@moodle.org>
Date:   Fri, 13 Jun 2014 08:42:09 +0800
Tag:    v2.6.4

Merge branch 'MOODLE_26_STABLE' into install_26_STABLE


commit 9ae6b73cafbf8d27221e1634fc2d8bd98531801f
Author: AMOS bot <amos@moodle.org>
Date:   Wed, 23 Apr 2014 08:38:06 +0800
Tag:    v2.6.3

Merge branch 'MOODLE_26_STABLE' into install_26_STABLE


commit 7800935d19b67dc307b38adac30605cc09f2fda3
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 28 Sep 2013 08:40:24 +0800
Tag:    v2.6.0-beta

Merge branch 'master' into install_master


commit a2c52dabefab5e57dbc84598ec46ddc0ea7b7c13
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 14 Sep 2013 08:41:33 +0800
Tag:    v2.6.0-beta

Merge branch 'master' into install_master


commit 88d4c218e9af99a37853fd51dedb2d8bc4f47878
Author: AMOS bot <amos@moodle.org>
Date:   Fri, 06 Sep 2013 08:47:45 +0800
Tag:    v2.6.0-beta

Merge branch 'master' into install_master


commit 096640fc5e3352483de2e6256945c2b845dec9e7
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 31 Aug 2013 08:43:52 +0800
Tag:    v2.6.0-beta

Merge branch 'master' into install_master


commit a28bdb19385f847b3322122d7bde20f642dbee97
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 24 Aug 2013 08:58:58 +0800
Tag:    v2.6.0-beta

Merge branch 'master' into install_master


commit 7081e477f243c2d8e1958d78123d9a755d88957b
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 27 Jul 2013 08:43:08 +0800
Tag:    v2.6.0-beta

Merge branch 'master' into install_master