Git merges in Moodle 2.0.3 by Sam Hemelryk

commit 36f0835e7271abfff017dfc8ef662e0c786aeba5
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 05 May 2011 13:26:46 +0800
Tag:    v2.0.3

Merge branch 's9_MDL-27382_dropbox_get_file_fix_20' of github.com:dongsheng/moodle into MOODLE_20_STABLE

commit 259b9d05f33a1c6ef39ecdf8cec7c8dfae7b911e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 05 May 2011 13:23:22 +0800
Tag:    v2.0.3

Merge branch 's9_MDL-27381_overwrite_dialog_safari_20' of github.com:dongsheng/moodle into MOODLE_20_STABLE

commit da20cd7b43ae0ef311c1b49bef9ef95ce6a95a86
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 05 May 2011 11:46:05 +0800
Tag:    v2.0.3

Merge branch 's9_MDL-26854_spam_comments_20_2' of git://github.com/dongsheng/moodle into MOODLE_20_STABLE

commit 7390fdde6305fc1d83a48ecce48a1607ad9972e8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 05 May 2011 10:42:58 +0800
Tag:    v2.0.3

Merge branch 's9_MDL-26854_spam_comments_20_2' of git://github.com/dongsheng/moodle into MOODLE_20_STABLE

commit 1374c61bb423b86890fabd61e40f17e23ea0ce21
Author: Sam Hemelryk <sam@moodle.com>
Date:   Thu, 05 May 2011 10:19:54 +0800
Tag:    v2.0.3

Merge branch 'MDL-26838_ratings_bad_data3' of git://github.com/andyjdavis/moodle into MOODLE_20_STABLE

commit c44a5d5946b0ae35ce3687bbfff46f087474b23f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 04 May 2011 13:56:59 +0800
Tag:    v2.0.3

Merge branch 's10_MDL-27330_dropbox_authorization_url_20' of github.com:dongsheng/moodle into MOODLE_20_STABLE

commit 0baa1eee59d045a2d7b3e5976d3d771042ab329a
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 May 2011 16:28:38 +0800
Tag:    v2.0.3

Merged MDL-26388 Fixed whitespace

commit 6a48b42ae8f8dfc6b04fb1db8660f26424e9b195
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 May 2011 15:42:26 +0800
Tag:    v2.0.3

Merge branch 'MDL-25805_MOODLE_20_STABLE' of git://github.com/nebgor/moodle into MOODLE_20_STABLE

commit 2dd90f136cae695b6d12b60204868eca176496f1
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 May 2011 11:00:15 +0800
Tag:    v2.0.3

Merge branch 'MDL-26628' of git://github.com/srynot4sale/moodle into MOODLE_20_STABLE

commit e6647397b9061c7bfa16400f5d99de8e2daa60c4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 03 May 2011 10:54:44 +0800
Tag:    v2.0.3

Merged MDL-27251 Fixed up whitespace, Fixed broken string, reworded new strings

commit e3cc5b1a7f7d51669314bb4400b30aa9fe6d7f29
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 May 2011 15:00:54 +0800
Tag:    v2.0.3

Merged changes and fixed whitespace issues for MDL-23188

commit 0742ea86b20c6ada06f3ac1e41882bc5a126786d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 May 2011 14:23:06 +0800
Tag:    v2.0.3

Merge branch 'MDL-26955-themedir-plugindirectory_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit 41f79b5c07c81a48341a83464c2f871d64b76292
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 May 2011 14:12:45 +0800
Tag:    v2.0.3

Merge branch 'MDL-27116-themedir-config_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit ed85c0acd249997d9b042de782c9c6ba39d86deb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 May 2011 14:09:26 +0800
Tag:    v2.0.3

Merge branch 'MDL-27155_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE

commit 9c39028179679a10c3fe47f12917bb239e323686
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 02 May 2011 12:14:05 +0800
Tag:    v2.0.3

Merge branch 'MDL-27246-cutomlang-version_20_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_20_STABLE

commit 2715f9693283c038e95f30cf8d65b899e2a9c339
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Apr 2011 16:29:49 +0800
Tag:    v2.0.3

Merged with small fix branch MDL-26516_m20_calevent_wip4 from git://github.com/rwijaya/moodle.git

commit a4b65c11b9e6d240b86042e030562f398aa812e3
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Apr 2011 10:46:54 +0800
Tag:    v2.0.3

Merged with conflict resolution branch MDL-26835_MASTER_grader_highlight_suspended_users from git://github.com/andyjdavis/moodle.git

commit e6cf40de7881a96c49824cdfb68895d4ee27614b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Tue, 19 Apr 2011 10:26:30 +0800
Tag:    v2.0.3

Merge branch 'MDL-25999_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE

commit 6f8081bef474eb48aad54b7b52104b3ce4b1239b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 18 Apr 2011 10:57:27 +0800
Tag:    v2.0.3

MDL-26958 PULL-675 Merged changes and removed border colour style

commit 465846f0823dd34370cc36197fef7ac95b9bfca4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Apr 2011 15:38:48 +0800
Tag:    v2.0.3

Merge branch 'MDL-25746_m20' of git://github.com/nebgor/moodle into MOODLE_20_STABLE

commit 67b5d74b2ce9cb3ecc15de2e8c6f488abbc980de
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Apr 2011 14:34:57 +0800
Tag:    v2.0.3

Merge branch 'MDL-27034_xhprof_table_sql_20' of git://github.com/stronk7/moodle into MOODLE_20_STABLE

commit 7d1fb2f6eca79ebccb733aab17252eb8cb8c54f9
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Apr 2011 11:54:50 +0800
Tag:    v2.0.3

Merged branch 'MDL-26185_m20' of git://github.com/andyjdavis/moodle.git and fixed conflicts

commit 227e54d65ad118394abf8823c61c8dcdc289bd50
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Apr 2011 11:38:21 +0800
Tag:    v2.0.3

Merge branch 'MDL-27063' of git://github.com/MaryE/moodle into MOODLE_20_STABLE

commit 728f3c9d0843e2f2969380ba82eae158d56ec412
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 04 Apr 2011 13:21:24 +0800
Tag:    v2.0.3

Merge branch 'MDL-26185_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE

commit 13c53a4a2ec225ae637bdee74a250849ec7f970e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Mar 2011 14:33:27 +0800
Tag:    v2.0.3

Merge branch 'w13_MDL-26992_20_uploadtemplates' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit d3796a2c61d01ee7007ccdda6a36b7fd71a50e99
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 28 Mar 2011 14:17:08 +0800
Tag:    v2.0.3

Merge branch 'w13_MDL-26989_20_enrolroles' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 8196e3c08dcd1cb6027cac122fc722e84595108f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Mar 2011 17:32:06 +0800
Tag:    v2.0.3

Merge branch 'MDL-26557' of git://git.luns.net.uk/moodle

commit 587a4ee42cf6ebec89619a3341e5a2370083da71
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Mar 2011 17:23:13 +0800
Tag:    v2.0.3

Merge branch 'MDL-26827' of git://git.luns.net.uk/moodle

commit c889fb83724801568472442d5fe2a85019912cbd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Mar 2011 17:19:06 +0800
Tag:    v2.0.3

Merge branch 'w12_MDL-26904_20_PHPLOL' of git://github.com/skodak/moodle

commit beb81f4947043cc0746ef58128a7901ae204f24e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Mar 2011 17:13:20 +0800
Tag:    v2.0.3

Merged PULL-496/MDL-26859 and fixed incorrect defines

commit ee780aeeaf8efb310d6f22eaba8b51d0fca530e0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Mar 2011 16:50:07 +0800
Tag:    v2.0.3

Merge branch 'w12_MDL-26876_20_blogformat' of git://github.com/skodak/moodle

commit d9738e84d6695fecc7727ebae3478faf707eb9c8
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Mar 2011 15:58:19 +0800
Tag:    v2.0.3

Merged PULL-480/MDL-24877 and bumped version number to fix conflict

commit 161ba40d03b06e5da387b2ef7a4a77ef532063bb
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Mar 2011 15:47:36 +0800
Tag:    v2.0.3

Merge branch 'w12_MDL-26808_20_enrolpageurl' of git://github.com/skodak/moodle

commit ca3fce634f0fe9944636aa5a5f9f92ddac8a249b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Mar 2011 14:27:45 +0800
Tag:    v2.0.3

Merge branch 'w12_MDL-26826_20_youtubedim' of git://github.com/skodak/moodle

commit 909fc3ff2e0195303e7f371c41d647134c817993
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Mar 2011 14:16:51 +0800
Tag:    v2.0.3

Merge branch 'w12_MDL-26726_20_typocat' of git://github.com/skodak/moodle

commit e460480080d59dc601f90efee639057faf5a6f60
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Mar 2011 14:10:44 +0800
Tag:    v2.0.3

Merge branch 'w12_MDL-26825_20_cancelform' of git://github.com/skodak/moodle

commit d1f54251711221e031dad49b25485f89485a97a4
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Mar 2011 13:37:36 +0800
Tag:    v2.0.3

Merge branch 'w12_MDL-26837_20_algebra' of git://github.com/skodak/moodle

commit 1698268db1795145f485550a63dca9f86ae38878
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Mar 2011 13:30:59 +0800
Tag:    v2.0.3

Merge branch 'w12_MDL-26834_20_inactiveparticipants' of git://github.com/skodak/moodle

commit 885e86b108b5cb8fff0148c2d7e0fcea7f36c053
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Mar 2011 12:36:47 +0800
Tag:    v2.0.3

Merge branch 'w12_MDL-26833_20_inactiveforum' of git://github.com/skodak/moodle

commit 37fff873983974bf0227d815b136b5d35a122c7e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Mar 2011 12:28:45 +0800
Tag:    v2.0.3

Merge branch 'w12_MDL-26803_20_userupload' of git://github.com/skodak/moodle

commit b89d39bfcb7ce8b001c10e21de3b15dce7056382
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Mar 2011 12:22:23 +0800
Tag:    v2.0.3

Merge branch 'w12_MDL-26842_20_ociparams' of git://github.com/skodak/moodle

commit 9d61397181ed38dbee538140867ca4088041dbec
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Mar 2011 11:54:20 +0800
Tag:    v2.0.3

Merge branch 'MDL-26607_search_error' of git://github.com/andyjdavis/moodle

commit 0235bd87067090fd32c6db81ebd8e699e0affa6f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 21 Mar 2011 11:16:50 +0800
Tag:    v2.0.3

Merged MDL-25565 PULL-451 and fixed conflicts

commit f786f011153d5f43c0a2e0ab43096319d458d801
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Mar 2011 18:02:18 +0800
Tag:    v2.0.3

Merge rebased branch 'formal_white_2011030507' of git://github.com/kordan/moodle.git

commit e96aa1a669d163cc592b24fb29c9e4a183dfc7a0
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Mar 2011 16:05:37 +0800
Tag:    v2.0.3

Merge branch 's7_MDL-26583_filepicker_lang' of git://github.com/dongsheng/moodle

commit 4bbe460316e7e596dff847a5a2ad229f0a476f2f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Mar 2011 15:41:51 +0800
Tag:    v2.0.3

Merge branch 'w11_MDL-26480_20_redirect' of git://github.com/skodak/moodle

commit 85f1abe30422e861b294d7314fa4b5a99d34b62b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Mar 2011 15:33:49 +0800
Tag:    v2.0.3

Merge branch 'MDL-13983' of git://github.com/timhunt/moodle

commit 9fed82de9c76058c93ea6086a240278c4080049d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Mar 2011 11:22:05 +0800
Tag:    v2.0.3

Merge branch 'MDL-26785' of git://github.com/stronk7/moodle

commit 2012d82a96df0384ed29c8fde334b6a5b3fd1afd
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Mar 2011 10:59:58 +0800
Tag:    v2.0.3

Fixed merge conflicts in nonzero theme

commit 66c6e870ef541ce17f43d3363aba65eca066a2f6
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Mar 2011 10:54:24 +0800
Tag:    v2.0.3

Merge branch 'MDL-25304' of git://github.com/epsd/moodle

commit b146486613ad4fa32f46e9d798bed112e6098a9b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Mar 2011 10:43:42 +0800
Tag:    v2.0.3

Merge branch 'MDL-25786-2' of git://github.com/epsd/moodle

commit e9fda1c9452c4ebb4e72dd7aa6414893bf860191
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Mar 2011 10:36:17 +0800
Tag:    v2.0.3

Merge branch 'MDL-25212' of git://github.com/epsd/moodle

commit af99e7286b569836443ef9410ee565fd095b11bf
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Mar 2011 10:33:17 +0800
Tag:    v2.0.3

Merge branch 'MDL-25939-3' of git://github.com/epsd/moodle

commit 77a5af1f1233f95b287eac7f8222c91c4f516a0e
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Mar 2011 10:19:52 +0800
Tag:    v2.0.3

Merge branch 'MDL-26084' of git://github.com/epsd/moodle

commit df94dbd825a4723ca3012109fd9e5bcd818fdf9d
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Mar 2011 09:57:55 +0800
Tag:    v2.0.3

Merge branch 'MDL-24743' of git://github.com/epsd/moodle

commit e2d50a6a007221b92bd6015522eee13174bc3ecc
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 14 Mar 2011 09:51:27 +0800
Tag:    v2.0.3

Merge branch 'MDL-26711' of git://github.com/epsd/moodle