Git merges in Moodle 2.5.2 by Sam Hemelryk
commit 5cdbdc4a7171d803592c6ad7ba66bc50cd2747ec
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 21 Aug 2013 09:13:18 +0800
Tag: v2.5.2
Merge branch 'wip-MDL-40830-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE
commit 34884b3ec8950f5476d38adf939bc4bfa881b5ec
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 21 Aug 2013 08:13:06 +0800
Tag: v2.5.2
Merge branch 'MDL-41162_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE
commit aee98acb92a5d138a395e1e611c706f4478fee11
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 21 Aug 2013 06:59:54 +0800
Tag: v2.5.2
Merge branch 'm25_MDL-41144' of git://github.com/danmarsden/moodle into MOODLE_25_STABLE
commit 8afa842c60380e05484da760bd2244cc21b8770b
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 21 Aug 2013 06:34:21 +0800
Tag: v2.5.2
Merge branch 'MDL-41157-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE
commit 6ef239f1c83af0835bc5e9a3495cde25bfb079ad
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 21 Aug 2013 05:30:14 +0800
Tag: v2.5.2
Merge branch 'MDL-41196-m25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE
commit 3f1c01de8d204296bce33bced061e99c3016d1ae
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 13 Aug 2013 06:19:16 +0800
Tag: v2.5.2
Merge branch 'MDL-41045-m25' of git://github.com/sammarshallou/moodle into MOODLE_25_STABLE
commit 7ccc8e8b1c52c7c3fb98312afeb09d5b123cf99a
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 13 Aug 2013 05:41:10 +0800
Tag: v2.5.2
Merge branch 'MDL-39691_25' of git://github.com/jmvedrine/moodle into MOODLE_25_STABLE
commit acea87e9b2999e8c82817ffafb7ecb410ebcc17f
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 13 Aug 2013 05:38:29 +0800
Tag: v2.5.2
Merge branch 'MDL-41091_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE
commit 05c04ad471a764be3aea8c20b573ae7401d62432
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 13 Aug 2013 05:31:43 +0800
Tag: v2.5.2
Merge branch 'wip-MDL-41114-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE
commit 6ae19630c5a0db8d1235323cea7c04cf8a8a8f03
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 13 Aug 2013 05:22:44 +0800
Tag: v2.5.2
Merge branch 'MDL-41033_m25' of git://github.com/rwijaya/moodle into MOODLE_25_STABLE
commit 19f92cfd80bd54bafb8d709645ff70030b2ea005
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 13 Aug 2013 05:09:59 +0800
Tag: v2.5.2
Merge branch 'MDL-40852_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE
commit 8e086c697ea044a36ab49aed96611d3c08c63f3d
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 13 Aug 2013 05:08:04 +0800
Tag: v2.5.2
Merge branch 'MDL-40996_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE
commit 2f1dbeb9bac02a2fe4eb3e7d7b683c078ebe4613
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 13 Aug 2013 04:45:25 +0800
Tag: v2.5.2
Merge branch 'MDL-30895-25' of https://github.com/mouneyrac/moodle into MOODLE_25_STABLE
commit 5c46191bd0b5da7b76b60041fa357517df4eca2f
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 13 Aug 2013 04:38:20 +0800
Tag: v2.5.2
Merge branch 'MDL-35931-25' of git://github.com/phalacee/moodle into MOODLE_25_STABLE
commit 55ad6e58419957aa3fdd85af172b0c6d8385ff2c
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 13 Aug 2013 04:35:34 +0800
Tag: v2.5.2
Merge branch 'MDL-35919-25' of git://github.com/phalacee/moodle into MOODLE_25_STABLE
commit 2f4aa72775b6561d3c507845f9de823fc098d49c
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 13 Aug 2013 04:32:43 +0800
Tag: v2.5.2
Merge branch 'MDL-35934_m25' of git://github.com/rwijaya/moodle into MOODLE_25_STABLE
commit 7ff9696fcb536fb05f3dca3fd903c16fd24f7c74
Author: Sam Hemelryk <sam@moodle.com>
Date: Thu, 08 Aug 2013 12:19:30 +0800
Tag: v2.5.2
Merge branch 'install_25_STABLE' of git://git.moodle.org/moodle-install into MOODLE_25_STABLE
commit 7478d2534b6546e04bbc1426b51c6a4ae42e311c
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 07 Aug 2013 06:37:34 +0800
Tag: v2.5.2
Merge branch 'MDL-40086-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE
commit 3267d961326894453c1d2540c2e6b7873cf412f1
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 06 Aug 2013 13:51:17 +0800
Tag: v2.5.2
Merge branch 'MDL-34989-25' of git://github.com/damyon/moodle into MOODLE_25_STABLE
commit aca4d181b982b3fe1b6ab0a99fecbbb1aec02741
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 06 Aug 2013 13:36:08 +0800
Tag: v2.5.2
Merge branch 'wip-mdl-40469-m25' of git://github.com/rajeshtaneja/moodle into MOODLE_25_STABLE
commit 0b1ee3b87177f384f13678aee8c99c7a0944285c
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 06 Aug 2013 13:01:55 +0800
Tag: v2.5.2
Merge branch 'MDL-40420_25' of https://github.com/prateeksachan/moodle into MOODLE_25_STABLE
commit ce3fe87f9174e349cf897a537221e7b0297349fd
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 06 Aug 2013 12:55:31 +0800
Tag: v2.5.2
Merge branch 'w32_MDL-41002_m25_enroltypo' of https://github.com/skodak/moodle into MOODLE_25_STABLE
commit d3751ed482b6bc8b8572e1e252c69aea78106a46
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 06 Aug 2013 10:39:29 +0800
Tag: v2.5.2
Merge branch 'MDL-40662_m25' of https://github.com/markn86/moodle into MOODLE_25_STABLE
commit a2f561b6a7401bd3d1748235a3465d80a58dbf1a
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 06 Aug 2013 06:10:46 +0800
Tag: v2.5.2
Merge branch 'MDL-27953_m25' of https://github.com/markn86/moodle into MOODLE_25_STABLE
commit eeb784d41d7bee8c91d52f2bc99dec55b4698e25
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 06 Aug 2013 05:55:10 +0800
Tag: v2.5.2
Merge branch 'w32_MDL-40889_m25_jsminify' of https://github.com/skodak/moodle into MOODLE_25_STABLE
commit 85180a0fa925704f0bd1f5181ba973c08e8afb67
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 05 Aug 2013 11:46:44 +0800
Tag: v2.5.2
Merge branch 'MDL-40937_assignment_history_25' of git://github.com/davosmith/moodle into MOODLE_25_STABLE
commit 737542c6741f00fd3a25803b56c139ec640d833a
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 05 Aug 2013 11:37:14 +0800
Tag: v2.5.2
Merge branch 'MDL-38758_m25' of https://github.com/markn86/moodle into MOODLE_25_STABLE
commit f16972e717682955fb7fdb1c0a9c8484efc5b5e6
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 05 Aug 2013 11:32:12 +0800
Tag: v2.5.2
Merge branch 'MDL-35922-25' of git://github.com/phalacee/moodle into MOODLE_25_STABLE
commit 9f15b383d16342517b17432f5a6a4cedb15b7df4
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 05 Aug 2013 10:38:38 +0800
Tag: v2.5.2
Merge branch 'MDL-35927_m25' of git://github.com/rwijaya/moodle into MOODLE_25_STABLE
commit 03c3e7c4e841efee2e3cc878bbaa50137135c292
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 05 Aug 2013 09:36:43 +0800
Tag: v2.5.2
Merge branch 'wip-MDL-34785-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE
commit 1496e4990fee8be8b66f23f5cd9b1ffdf16c9e05
Author: Sam Hemelryk <sam@moodle.com>
Date: Fri, 02 Aug 2013 04:12:26 +0800
Tag: v2.5.2
Merge branch 'install_25_STABLE' of git://git.moodle.org/moodle-install into MOODLE_25_STABLE
commit cecc076eb75b832d6687feee0ce6f72fc989891d
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 30 Jul 2013 05:40:28 +0800
Tag: v2.5.2
Merge branch 'MDL-40746_25' of git://github.com/grabs/moodle into MOODLE_25_STABLE
commit a38830a07b9ce95043ab005872ff99e84d57e47d
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 30 Jul 2013 04:59:26 +0800
Tag: v2.5.2
Merge branch 'MDL-39461_25' of https://github.com/totara/openbadges into MOODLE_25_STABLE
commit 5fb1fad943d03ed9d99a96c8ff491203f70513cd
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 29 Jul 2013 08:54:16 +0800
Tag: v2.5.2
Merge branch 'MDL-40878_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE
commit 7b3a806741fb6dbb3250f422360ce47adaad6286
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 29 Jul 2013 07:52:35 +0800
Tag: v2.5.2
Merge branch 'w31_MDL-40891_m25_mkdirrace' of https://github.com/skodak/moodle into MOODLE_25_STABLE
commit 8ba4fd3b9a89b4c6c74cde1af74d76b2d7fc67fe
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 29 Jul 2013 07:49:41 +0800
Tag: v2.5.2
Merge branch 'MDL-40727-25' of git://github.com/damyon/moodle into MOODLE_25_STABLE
commit fa386d3e366119126aece3cba5e26fd570054fb8
Author: Sam Hemelryk <sam@moodle.com>
Date: Mon, 29 Jul 2013 07:01:45 +0800
Tag: v2.5.2
Merge branch 'MDL-40854_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE
commit 7de495d5c6f622f4445bd70d176d6015ba2c815b
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 24 Jul 2013 07:27:58 +0800
Tag: v2.5.2
Merge branch 'wip-MDL-37869-stable25' of git://github.com/phalacee/moodle into MOODLE_25_STABLE
commit 5590ac2aff903f57ca8c02342707b4bbcca84382
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 24 Jul 2013 07:14:01 +0800
Tag: v2.5.2
Merge branch 'MDL-40315_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE
commit 63ddd040c0d1debf49ea3d58cf23a86fd256a936
Author: Sam Hemelryk <sam@moodle.com>
Date: Tue, 23 Jul 2013 10:13:59 +0800
Tag: v2.5.2
Merge branch 'MDL-40680-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE
commit 70e9700195a01da1eb6414c142da6ef306d40207
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 10 Jul 2013 08:18:36 +0800
Tag: v2.5.2
Merge branch 'wip-MDL-40593-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE
commit c001e046e04e6cdddab5643060970d1da1297f9f
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 10 Jul 2013 07:02:01 +0800
Tag: v2.5.2
Merge branch 'w28_MDL-40450_m25_tinymcebuttons' of https://github.com/skodak/moodle into MOODLE_25_STABLE
commit 7c6e64c36cbd72b51ffcbf4c162bd5667d5ba279
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 10 Jul 2013 06:31:25 +0800
Tag: v2.5.2
Merge branch 'MDL-40527_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE
commit c6b546a1ee58c1878b2eddaca84df1ea784a4a9b
Author: Sam Hemelryk <sam@moodle.com>
Date: Wed, 10 Jul 2013 06:09:59 +0800
Tag: v2.5.2
Merge branch 'm25_MDL-40512' of git://github.com/danmarsden/moodle into MOODLE_25_STABLE