Merge branch 'MDL-31000-master-1' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 8 Jan 2012 22:52:29 +0000 (11:52 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 8 Jan 2012 22:52:29 +0000 (11:52 +1300)
commit94a2296a8efd45fbddd0578f81f3a5cb00bd963d
treea446c84978e9758d3411a05c5b6581234a4681d1
parentf8a3a3fb9a0df2727108510a183832c05570124c
parentef72c7942e69b41296989bbbd51a0d84ee4f636b
Merge branch 'MDL-31000-master-1' of git://git.luns.net.uk/moodle