Git merges in Moodle 2.0.10 by Dan Poltawski

commit bf4980480aeee2575d4a3250d8d11d148447c56d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Jul 2012 16:36:01 +0800
Tag:    v2.0.10

Merge branch 'w27_MDL-34045_m20_idnumber' of git://github.com/skodak/moodle into MOODLE_20_STABLE

commit 1c84aa80ccf5af41f7b049c278f85f3ba871ec09
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Jun 2012 21:58:34 +0800
Tag:    v2.0.10

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

commit c2eaf6e2c1287f79fc9aff63024e10286c681e9f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Jun 2012 18:47:28 +0800
Tag:    v2.0.10

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