Git merges in Moodle 2.1.x by David Mudrak

commit b61cf3ff8a3467a9245325f5157c1b20e090c116
Author: David Mudrak <david@moodle.com>
Date:   Thu, 09 Jun 2011 19:04:49 +0800
Tag:    v2.1.0

MDL-22414 Merge branch 'master' into backup-convert

commit a78b139ce6bc18c64f79eed9df210f9df16580db
Author: David Mudrak <david@moodle.com>
Date:   Sat, 04 Jun 2011 05:22:23 +0800
Tag:    v2.1.0

Merge branch 'master' into backup-convert

commit db6491bf9ef33a80981e5dbce52f25a83223fc08
Author: David Mudrak <david.mudrak@gmail.com>
Date:   Sat, 04 Jun 2011 05:15:26 +0800
Tag:    v2.1.0

Merge pull request #10 from nebgor/MDL-27451

commit 0f5860f707f398bb330bd142b33da2f8f1a594be
Author: David Mudrak <david.mudrak@gmail.com>
Date:   Fri, 03 Jun 2011 14:08:12 +0800
Tag:    v2.1.0

Merge pull request #11 from nebgor/MDL-27447

commit 193407a0968138891780e678557c3cadc1f4a101
Author: David Mudrák <david.mudrak@gmail.com>
Date:   Tue, 31 May 2011 14:35:26 +0800
Tag:    v2.1.0

Merge pull request #9 from nebgor/MDL-27449

commit ba1e221a0d34838a20fb5757bec56027987962ae
Author: David Mudrák <david.mudrak@gmail.com>
Date:   Tue, 31 May 2011 07:26:18 +0800
Tag:    v2.1.0

Merge pull request #7 from rwijaya/MDL-27441b

commit 071f617c52fcb66e8ff05a4ab4b05b23f039e537
Author: David Mudrák <david.mudrak@gmail.com>
Date:   Mon, 30 May 2011 13:46:31 +0800
Tag:    v2.1.0

Merge pull request #6 from rwijaya/MDL-27446b

commit 64f7da240224a3f5c70fb32031a15cde4c0532b7
Author: David Mudrák <david.mudrak@gmail.com>
Date:   Fri, 27 May 2011 21:44:30 +0800
Tag:    v2.1.0

Merge pull request #2 from rwijaya/MDL-27450

commit 455fc30367eb7d3f1bfe43eb94f1993a350abadf
Author: David Mudrák <david.mudrak@gmail.com>
Date:   Fri, 27 May 2011 21:34:38 +0800
Tag:    v2.1.0

Merge pull request #1 from nebgor/MDL-27440_chunkyfix

commit f6f7a7266c641407261d1220eae14b5e71fdbdbe
Author: David Mudrak <david@moodle.com>
Date:   Thu, 26 May 2011 23:30:27 +0800
Tag:    v2.1.0

Merge branch 'master' into backup-convert

commit 8b866ce4b1e0d9f4e4e6146c1584fdece841cb3c
Author: David Mudrak <david@moodle.com>
Date:   Tue, 24 May 2011 15:21:38 +0800
Tag:    v2.1.0

Merge branch 'MDL-27439' of git://github.com/nebgor/moodle into backup-convert

commit c18f90f22f76651ca44f283573849624d59903e7
Author: David Mudrak <david@moodle.com>
Date:   Wed, 18 May 2011 22:08:15 +0800
Tag:    v2.1.0

Merge remote branch 'github/master' into backup-convert

commit eb3dc80bc33c9dc82771d47ec23a718881ac482b
Author: David Mudrak <david@moodle.com>
Date:   Fri, 13 May 2011 09:16:13 +0800
Tag:    v2.1.0

Merge branch 'master' into backup-convert