Git merges in Moodle 2.3.0 by Petr Škoda

commit 311d8d727720285bdfca359320be35aa19c2dfa2
Author: Petr Škoda <info@skodak.org>
Date:   Tue, 21 Jun 2011 15:42:13 +0800
Tag:    v2.3.0-beta

Merge pull request #3 from mylescarrick/4b76ec61c07401bfa784cf1e62c622cad6cb1ce6

commit 0aff11c5aedf0b26014d89289686ab5f5c946335
Author: Petr Skoda <info@skodak.org>
Date:   Sun, 01 Aug 2010 21:10:36 +0800
Tag:    v2.3.0-beta

cvsimport