Git merges in Moodle 1.9.12 by Petr Skoda

commit 5dce59a4cf2662feeb07ffc091889094a573305c
Author: Petr Skoda <commits@skodak.org>
Date:   Tue, 15 Mar 2011 00:58:46 +0800
Tag:    v1.9.12

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