Merge branch 'MDL-29195-master-1' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Dec 2011 00:50:42 +0000 (13:50 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Dec 2011 00:50:42 +0000 (13:50 +1300)
commitffdbcf3998461e06278c5efbd6a4b5a185aaa7e3
treebbb57355a682234c646733866784885b5c8efba4
parentf89a83b87b65d19f3e13250f99489b755ffbf3dd
parent93e1d182e5cc7e6c2bd4824ec7219a0a3e263984
Merge branch 'MDL-29195-master-1' of git://git.luns.net.uk/moodle