Git merges in Moodle 2.2.11 by Dan Poltawski

commit 1efdabfb91266d0367ba1751786f9225bc4eafa0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 27 May 2013 10:03:47 +0800
Tag:    v2.2.11

Merge branch 'w22_MDL-25031_m22_blockupgrade' of git://github.com/skodak/moodle into MOODLE_22_STABLE