Git merges in Moodle 1.9.15 by Eloy Lafuente (stronk7)

commit 6ae95cc856edb36136c6ff62299ab98031339972
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 18 Nov 2011 00:11:53 +0800
Tag:    v1.9.15

Merge branch 'MDL-29551' of git://github.com/ankitagarwal/moodle into MOODLE_19_STABLE

commit 5fe44ec90db7f44b429c2037f6664ddcb6d8562f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 12 Nov 2011 01:31:34 +0800
Tag:    v1.9.15

Merge branch 'MDL-29092_m19' of git://github.com/rwijaya/moodle into MOODLE_19_STABLE