Git merges in Moodle 1.9.14 by Petr Skoda

commit b3b781f9fcaa2daa3d317e2e119d651c30dc5e92
Author: Petr Skoda <commits@skodak.org>
Date:   Mon, 01 Aug 2011 19:16:00 +0800
Tag:    v1.9.14

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