Merge branch 'master' of git://github.com/moodle/moodle
authorKordan <kordan@mclink.it>
Fri, 27 Jan 2012 07:25:02 +0000 (08:25 +0100)
committerKordan <kordan@mclink.it>
Fri, 27 Jan 2012 07:25:02 +0000 (08:25 +0100)

Trivial merge