Merge branch 'xhprof' of git://github.com/stronk7/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 20 Dec 2010 21:59:20 +0000 (22:59 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 20 Dec 2010 21:59:20 +0000 (22:59 +0100)

Trivial merge