Git merges in Moodle 2.5.0 by Petr Škoda

commit 0b196a09a8dc990ee352221942ad998750ed81e4
Author: Petr Škoda <commits@skodak.org>
Date:   Sat, 12 Jan 2013 22:49:36 +0800
Tag:    v2.5.0-beta

Merge branch 'refs/heads/w02_MDL-37286_m25_tracebuffer' into w02_MDL-37187_m25_flatfile

commit 31a22c216cac572ee19aaeacf90b5ed8cfc58ed4
Author: Petr Škoda <commits@skodak.org>
Date:   Sat, 12 Jan 2013 22:49:30 +0800
Tag:    v2.5.0-beta

Merge branch 'refs/heads/w02_MDL-37184_m25_editenrol' into w02_MDL-37187_m25_flatfile