Git merges in Moodle 1.9.17 by Eloy Lafuente (stronk7)

commit b3391165f174f9f52dbf935d863745bd49b86795
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 09 Mar 2012 16:49:52 +0800
Tag:    v1.9.17

Merge branch 'wip-MDL-31248-MOODLE_19_STABLE-v3' of git://github.com/abgreeve/moodle into MOODLE_19_STABLE


commit ebd57374cb6c048892cd8e930828f6ed27a39dd7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 17 Jan 2012 19:38:56 +0800
Tag:    v1.9.17

Merge branch 'w03_MDL-31213_m19_attributesmess' of git://github.com/skodak/moodle into MOODLE_19_STABLE


commit 863b49bd9c5458cffb0adcda585b0be9dc718db8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 09 Jan 2012 05:59:52 +0800
Tag:    v1.9.17

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