Merge branch 'MDL-44597-master' of git://github.com/andrewnicols/moodle
commitda1a0bc3a99af7e9aa42289f2634a7685c2e129b
authorMarina Glancy <marina@moodle.com>
Tue, 25 Mar 2014 08:49:01 +0000 (25 16:49 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 25 Mar 2014 08:49:01 +0000 (25 16:49 +0800)
tree57d3069b68905a0abe3737903dac5555c5ac1e58
parente34003004e90545a9289164434c3baa388cd3f6b
parent5d504395f720bd80908b608b7dc2696e04432f5d
Merge branch 'MDL-44597-master' of git://github.com/andrewnicols/moodle
lib/outputlib.php