Git merges in Moodle 1.9.13 by Sam Hemelryk

commit e41831dde45dc38eabc96535c0bc528e98f4ee71
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 11:04:13 +0800
Tag:    v1.9.13

Merge branch 'w29_MDL-27464_m19_continue' of git://github.com/skodak/moodle into MOODLE_19_STABLE


commit fb50bf6c32274472a2fd5b7c98fc9fbd3ba2709f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 25 Jul 2011 10:25:08 +0800
Tag:    v1.9.13

Merge branch 'w29_MDL-28360_m19_flatfile' of git://github.com/skodak/moodle into MOODLE_19_STABLE


commit 61b865f72cc481fa5567bc2c7d12c8b18b3089f0
Author: Sam Hemelryk <sam.hemelryk@gmail.com>
Date:   Mon, 18 Jul 2011 17:29:08 +0800
Tag:    v1.9.13

Merge branch 'MDL-27889_MOODLE_19_STABLE' of git://github.com/nebgor/moodle into MOODLE_19_STABLE


commit b2d016f3da2289cacd4cf5a4c87a444cf37c2eda
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 11 Jul 2011 13:38:58 +0800
Tag:    v1.9.13

Merge branch 'wip-MDL-28197-MOODLE_19_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_19_STABLE


commit c74a93d0175ac91854cb61ba1fe9d81d9e07989f
Author: Sam Hemelryk <sam@moodle.com>
Date:   Wed, 06 Jul 2011 12:10:17 +0800
Tag:    v1.9.13

Merge branch 'MDL-27716_19' of git://github.com/timhunt/moodle into MOODLE_19_STABLE


commit d98e3d6b6082f08d1f8c0049835ab887a247c83b
Author: Sam Hemelryk <sam@moodle.com>
Date:   Mon, 13 Jun 2011 14:55:48 +0800
Tag:    v1.9.13

Merge branch 'm19_MDL-27404' of git://github.com/danmarsden/moodle into MOODLE_19_STABLE